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

Incorrect/confusing merge notification

From: Mark Phippard <markphip_at_gmail.com>
Date: 2007-10-19 16:20:58 CEST

I saw someone else mention this in another email thread. I just
wanted to revive it and give a sample.

Using the merge tracking sample repository from CollabNet:

$ svn co $R/trunk notify
A notify/products
A notify/products/little.html
A notify/products/medium.html
A notify/products/big.html
A notify/products/roadmap.html
A notify/products/index.html
A notify/about
A notify/about/index.html
A notify/index.html
A notify/news
A notify/news/index.html
A notify/support
A notify/support/index.html
A notify/jobs
A notify/jobs/index.html
 U notify
Checked out revision 17.
$ cd notify/
$ svn merge $R/branches/a
--- Merging r8 through r17 into '.':
A products/roadmap.html
$ svn st
 M .

The 'A'dd notification should not be happening. The file has already
been added and committed via a previous merge. All of the changes
from branches/a have already been merged to trunk via /branches/b.

Mark Phippard
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Oct 19 16:21:23 2007

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.