Re: wc-ng and add/add tree conflicts

From: Stefan Sperling <stsp_at_elego.de>
Date: Wed, 8 Apr 2009 14:25:19 +0100

On Wed, Apr 08, 2009 at 02:51:50PM +0200, Greg Stein wrote:
> Hmm. A very good point!
>
> Okay... I'll ponder more on this.
>
> For the update case, if the WORKING node's checksum is up to date,
> then we could "compare" the incoming text and the locally-added text
> (and the two sets of properties) to determine equality.

Yeah, right now, we do a full content comparison IIRC.
Comparing checksums might be better if we have checksums available.

Stefan
Received on 2009-04-08 15:25:52 CEST

This message: [ Message body ]
Next message: Lieven Govaerts: "Re: Mac buildbot is red (trunk build for local work?)"
Previous message: Senthil Kumaran S: "Re: svn commit: r37088 - in trunk/subversion: include libsvn_client libsvn_wc svn tests/cmdline tests/cmdline/upgrade_tests_data"
In reply to: Greg Stein: "Re: wc-ng and add/add tree conflicts"

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