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

Re: Sparse working copy in 1.8.0 causes problems for others' merges; 1.7.x didn't complain

From: Philip Martin <philip.martin_at_wandisco.com>
Date: Fri, 17 May 2013 20:26:37 +0100

Paul Burba <ptburba_at_gmail.com> writes:

>> sqlite3 wc/.svn/wc.db "select op_depth, local_relpath, presence, repos_path, revision from nodes order by op_depth, local_relpath"
>> 0||normal|B|6
>> 0|P|normal|B/P|6
>> 0|X|normal|B/X|6
>> 2|P/Q|normal|T/P/Q|6
>> 2|P/Q/R|normal|T/P/Q/R|6
>> 3|P/Q/R|base-deleted||
>> The merge has created a bogus copy, it has the path structure associated
>> with r3 but is marked r6.
> Fixed this in http://svn.apache.org/viewvc?view=revision&revision=1483947
> I'm confident this fix is correct, but would appreciate any review,
> since this is a convoluted use case.

Great! I was experimenting with the same patch locally but as I'm not
familiar with the merge code I wasn't sure whether I should commit it.

Certified & Supported Apache Subversion Downloads:
Received on 2013-05-17 21:27:12 CEST

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.