On Fri, Jun 10, 2011 at 07:27:59AM +0200, Dirk Heinrichs wrote:
> Am 09.06.2011 16:42, schrieb Bob Archer:
> >Check to see if prior to your merge that file already had merge info on it.
> >If it does then the merge info will be updated on that item, even if that
> >item is not modified by the dif
Am 09.06.2011 16:42, schrieb Bob Archer:
Check to see if prior to your merge that file already had merge info on it. If
it does then the merge info will be updated on that item, even if that item is
not modified by the diff.
OK, but how do I get rid of this, it's really irritating for the use
Am 09.06.2011 16:30, schrieb Sulser, Timothy (IFPRI):
I don't think you'll be able to get rid of that behavior unless you change your
strategy for making personal backups.
The personal backup was made solely to reproduce the problem in a clean
environment, without interference from other devs.
> I'm facing a problem where I get items modified by a merge although
> there should be nothing to merge at all.
>
> I create a new branch from trunk.
> I checkout from that new branch.
> I merge from trunk into the new branch.
>
> [ No intermediate commit did happen as I'm doing this on a person
Context:
-Original Message-
From: Heinrichs, Dirk [mailto:dirk.heinri...@capgemini.com]
...
svn status now shows some modified elements, and if I look at them with svn
diff, I get something like
Property changes on: path/to/file
Hi,
I'm facing a problem where I get items modified by a merge although
there should be nothing to merge at all.
I create a new branch from trunk.
I checkout from that new branch.
I merge from trunk into the new branch.
[ No intermediate commit did happen as I'm doing this on a personal
backup c
