Merging custom branch into the tranck

[Roman Rytov]

I have a tranck and sometimes I branch it for various reasons (bugs,
features, customizations). Among the files I have a build.xml that
contains inforamtion for building the module. When I make merging this
file prevent me from doing entire branch merge. Is there a pattern to
work around this problem? I see one as storing such files separetely
from the module but this way doesn't look elegant at all. Ideas?

[Chuck Karish]

Roman Rytov wrote: I have a tranck and sometimes I branch it for various reasons (bugs, features, customizations). Among the files I have a build.xml that contains inforamtion for building the module. When I make merging this file prevent me from doing entire branch merge. Is there a pattern to work around this problem? I see one as storing such files separetely from the module but this way doesn't look elegant at all. Ideas?

Are you doing this from an Ant task that's in a build.xml that's part of
the module you want to merge?

[Rotor]

Chuck Karish <karish@well.com> wrote in message news:<bXBMa.1102$_83.197@fe01.atl2.webusenet.com>... Ro0000000000000000000001
n Rytov wrote: I have a tranck and sometimes I branch it for various reasons (bugs, features, customizations). Among the files I have a build.xml that contains inforamtion for building the module. When I make merging this file prevent me from doing entire branch merge. Is there a pattern to work around this problem? I see one as storing such files separetely from the module but this way doesn't look elegant at all. Ideas? Are you doing this from an Ant task that's in a build.xml that's part of the module you want to merge?

Actually not. I do it manually.
I see no other way as to do merging by a script.

[Chuck Karish]

Rotor wrote: Chuck Karish <karish@well.com> wrote in message news:<bXBMa.1102$_83.197@fe01.atl2.webusenet.com>... n Rytov wrote:I have a tranck and sometimes I branch it for various reasons (bugs,features, customizations). Among the files I have a build.xml thatcontains inforamtion for building the module. When I make merging thisfile prevent me from doing entire branch merge. Is there a pattern towork around this problem? I see one as storing such files separetelyfrom the module but this way doesn't look elegant at all. Ideas?Are you doing this from an Ant task that's in a build.xml that's part ofthe module you want to merge? Actually not. I do it manually. I see no other way as to do merging by a script.

The most likely problem is that a process is holding the build.xml file
open, and your operating system isn't letting the SCM tool access it.
Find the other user of the file and stop it.