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

SVN 1.6.x - Merge using sparse checkout resulting in tree conflicts

From: Srinivas Kotla <skotla_at_broadsoft.com>
Date: Mon, 22 Feb 2010 14:38:47 -0800

Hi,

Did anyone run into issues with merge resulting in tree conflicts when using sparse checkouts?

Some directories that were not checkedout in the working copy were marked as tree conflicts after the merge (local delete, incoming edit upon merge).

Thanks,
Srinivas Kotla | Configuration Management | BroadSoft | +1 240.364.5260 | skotla@broadsoft.com<mailto:sdemattio@broadsoft.com> | www.broadsoft.com<http://www.broadsoft.com/>
Received on 2010-02-22 23:42:08 CET

This message: [ Message body ]
Next message: Stefan Sperling: "Re: SVN 1.6.x - Merge using sparse checkout resulting in tree conflicts"
Previous message: Pat Farrell: "Re: Automated Merging"
Next in thread: Stefan Sperling: "Re: SVN 1.6.x - Merge using sparse checkout resulting in tree conflicts"
Reply: Stefan Sperling: "Re: SVN 1.6.x - Merge using sparse checkout resulting in tree conflicts"

Contemporary messages sorted: [ by date ] [ by thread ] [ by subject ] [ by author ] [ by messages with attachments ]

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.