Re: Fwd: Cannot reintegrate feature branch

2010-05-06 Thread Jean Seurin
Hi Stefan, it actually does not appear in mergeinfo. thanks Jean On Thu, May 6, 2010 at 7:11 PM, Stefan Sperling wrote: > On Thu, May 06, 2010 at 06:49:51PM +0800, Jean Seurin wrote: > > added line > > /branches/project-1.13/*pathToFile*:6266-6372 > > A * has special meaning in mergeinfo. > Do

Re: Fwd: Cannot reintegrate feature branch

2010-05-06 Thread Stefan Sperling
On Thu, May 06, 2010 at 06:49:51PM +0800, Jean Seurin wrote: > added line > /branches/project-1.13/*pathToFile*:6266-6372 A * has special meaning in mergeinfo. Does the * actually appear in the mergeinfo or not? Stefan

Fwd: Cannot reintegrate feature branch

2010-05-06 Thread Jean Seurin
Some more information, that may indicate a bug: All and only the 5 files concerned with the probleme have been commited during after a merge from the trunk, empty of modification, but with the raw properties modified as follow: added line /branches/project-1.13/*pathToFile*:6266-6372 This comes f