[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: a question about "svn merge"

From: Stefan Sperling <stsp_at_elego.de>
Date: Wed, 22 Jun 2011 10:46:38 +0200

On Wed, Jun 22, 2011 at 04:36:17AM -0400, Boying.Lu_at_emc.com wrote:
> Hi, All,
>
> I use "svn merge ^trunk" to merge changes to my branch.
>
> I found one file that shows no conflict but actually the changes were
> not added to this file at all.
>
> The subversion I use is 1.6.12. Is is a known issue or a new bug?
>

Very hard to tell without more information.
The reason could simply be that a user didn't carry out a merge correctly.

To argue that it is a bug, you'd need to present a script that runs
svn commands and shows the problem, starting off from an empty
repository, doing merges etc. until you get to the point where
the problem appears. That's the best way to demonstrate bugs, and
also a good way of starting someone off with getting the bug fixed.
Received on 2011-06-22 10:47:16 CEST

This is an archived mail posted to the Subversion Users mailing list.

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.