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

Re: gui client status

From: Ben Collins-Sussman <sussman_at_collab.net>
Date: 2002-07-08 17:37:10 CEST

Martijn Boekhorst <subversion@boekhorst.net> writes:

> One question though, I'd like to do three-way for conflicts - how
> does one easily get the 'youngest' repository version (alongside
> pristine and working copy versions)? Just need a file or
> mem. binary.

When you update and a file becomes "conflicted", two things happen:

  1. The working file now contains conflict markers.
  2. All three fulltexts are sitting in the working copy, next to the
      working file.

The three fulltexts are tracked in the entries file. If you get the
entry for the conflicted file (svn_wc_entry()), look at the values of
the conflict_* fields in the entry structure. Those are the 3
tmpfiles you can display.

To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Mon Jul 8 17:41:43 2002

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.