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

diff and merge behaviour

From: Branko ─îibej <brane_at_xbc.nu>
Date: 2002-07-25 05:23:08 CEST

I'm sure many of you were glad to notice my huge commit to the
issue-531-dev branch. :-)

While doing this, I noticed several things:

   1. During the merge, several new files that had appeared on /trunk
      were added to my WC. Well and good; _but_ they were added without
      ancestry, creating a new node. I submit that "svn merge" should
      actually perform a copy when adding or replacing files; this would
      let diff avoid the weirdness I describe below.

   2. Now, when I diff /trunk and /branches-531-dev, I get _two_ diffs
      for those files; one that removes it, and another that adds the
      very same, identical contents. That's bad.

   3. The other diff weirdness is that it insists on printing the diff
      header, even when the actual diff turns out to be empty.

I suspect fixing (1) will fix (2). (3) should be trivial once we have
the integrated diff library.

Do we have any issues filed for these problems? I seem to remember
something about (3), but not (1) and (2).

Brane ─îibej   <brane_at_xbc.nu>   http://www.xbc.nu/brane/
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Jul 25 05:23:41 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.