Bug during (interactive) merging?
From: Jens Seidel <jensseidel_at_users.sourceforge.net>
Date: Thu, 5 Jun 2008 17:53:35 +0200
Hi,
I noticed an unexpected behaviour during a merge with a recent 1.5
Nevertheless here is the story:
* Create a branch as copy of trunk
* Merge the renaming and removal in trunk to branch.
Since the files in trunk and branch share no common history I'm unsure
The status in branch is now:
If I merge first the renaming and after it the removal (without
M .
Is this a bug? At least after reading the changelog and especially
I tried to reproduce a situation in my large repository where a merge of
But please note that I had a conflict in this directory (before the
PS: issue #756 was reopened. Should it stay fixed in the CHANGES file?
Jens
---------------------------------------------------------------------
|
This is an archived mail posted to the Subversion Dev mailing list.
This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.