On Wednesday 03 February 2010, Olivier Sannier wrote:
> Ulrich Eckhardt wrote:
> > 2. Merge to the root of the project only. This avoids having subdirs
> > with differing mergeinfos. This is a bit difficult in your project,
> > because it contains the libs which are otherwise on the same "level",
Ulrich Eckhardt wrote:
Check if while merging you omitted changing the mergeinfo in the 'libA'
folder. If so, that's probably a human error. Adding the missing info
manually is the right way to go.
Actually, the fact that merging to X changes the mergeinfo in subdir Y that
wasn't touched is a co
On Tuesday 02 February 2010, Olivier Sannier wrote:
> tags
> branches
> feature1
> trunk
> libs
> libA
> libB
> project1
> vendors
> libA
> current
> libB
> current
[...]
> the feature1 branch was created as a copy of /trunk at revision 45 and
> changes from trunk were reg
Olivier Sannier wrote:
Hello all,
Let's consider the following repository structure :
tags
branches
feature1
trunk
libs
libA
libB
project1
vendors
libA
current
libB
current
The repository is at revision 100
libA and libB are external libraries managed as vendor branch
Hello all,
Let's consider the following repository structure :
tags
branches
feature1
trunk
libs
libA
libB
project1
vendors
libA
current
libB
current
The repository is at revision 100
libA and libB are external libraries managed as vendor branches which
were merged tw
