I figured it out. I missed a salient nuance. I performed the merge upon
the build machine. In general the source is not modified during build,
except for the files in question. I didn't do a status or a revert prior to
the merge, so I picked up some harmless changes that led to much confusion.
So, I was right, it was user error. I'm working on a script now that will
verify that all changes have made it from my branch to my trunk and for each
change that hasn't, it will perform some light weight analysis.
Thanks for the response...
-----Original Message-----
From: kfogel@collab.net [mailto:kfogel@collab.net]
Sent: Saturday, October 09, 2004 5:41 PM
To: Peter Kahn
Cc: users@subversion.tigris.org
Subject: Re: Merge Bug? no, it must be user error....I hope
I think to be able to help, we might need a totally concrete example
(the actual revisions, the actual changes, the actual URLs, etc).
-Karl
pkahn@connected.com writes:
> Guys, I recently discovered an issue with a merge between my branches.
> Basically, this happened:
>
> I have branches currentA, currentB, newReleaseC
> I merged a revision range from currentA to currentB and found changes that
> are only in newReleaseC.
Received on Mon Oct 11 14:42:37 2004