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

Re: Feature request - ignore-ancestry for merge

From: Simon Large <simon_at_skirridsystems.co.uk>
Date: 2006-07-05 22:47:03 CEST

prodgers@funmobility.com wrote:
> We could really use an --ignore-ancestry checkbox in the merge dialog to
> handle cases when snapshots were independently imported into SVN. In
> these
> cases merges via Tortoise (or command-line without --ignore-ancestry)
> often
> fail with "<URL> doesn't match existing URL <URL> in <dir>", while
> command-
> line merges with --ignore-ancestry succeed.
> For more detail, see http://svn.haxx.se/users/archive-2004-04/0632.shtml
> This has been brought up before most recently as
> http://svn.haxx.se/tsvnusers/archive-2006-01/0179.shtml, but hasn't
> been filed as a Feature Request in the issuetracker.

It's already been done, but not released yet.

 From the 1.4.0 changelog:
- NEW: Option to ignore the ancestry in a merge. (Stefan)


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Wed Jul 5 22:46:29 2006

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

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