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

Re: [BUG] Borked 1.5.x CHANGES merging

From: Hyrum K. Wright <hyrum_wright_at_mail.utexas.edu>
Date: Sat, 12 Apr 2008 09:06:46 -0500

Mark Phippard wrote:
> On Sat, Apr 12, 2008 at 2:22 AM, David Glasser <glasser_at_davidglasser.net> wrote:
>> I say this because with a clean 1.5.x checkout at r30560 and a clean
>> trunk svn from the same revision, I just get:
>> glasser_at_filthy-assistant:~/Projects/Subversion/svn-1.5.x$ svn merge
>> --accept theirs-full http://svn.collab.net/repos/svn/trunk/CHANGES
>> --- Merging r1283 through r30560 into 'CHANGES':
>> ... on the other hand, it appears to do nothing, not even change mergeinfo.
> We went through similar issues a couple weeks ago with Julian. The
> problem was that his 1.5.x branch was checked out before we updated to
> 1.5 and "cleaned" the repository. If you recall, all WC's needed to
> be re-checked out once we did that. CHANGES should not have any
> mergeinfo on it.

Actually, CHANGES should have mergeinfo on it.

hyrum-wrights-macbook-pro:svn-1.5.x Hyrum$ subversion/svn/svn diff -c30329
--- CHANGES (revision 30328)
+++ CHANGES (revision 30329)
@@ -14,6 +14,7 @@
      * Cyrus SASL support for ra_svn and svnserve (issue #1144)

    - Minor new features and improvements:
+ * 'svn resolve' (with '--accept' option) replaces "resolved" (issue #2784)
      * 'svn move file1 file2 ... dir' now moves the files into dir (issue #747)
      * 'svn mkdir' and 'svn copy' now take '--parents' option (issue #1776)
      * 'svn delete' now takes '--keep-local' to not remove working copy files
@@ -65,7 +66,6 @@
      * 'svnserve' now takes '--config-file' option (r24119)
      * 'mod_dav_svn' now uses Apache default mime-type for files (issue #2304)
      * now accept "peg dates" (URL@{DATE}), behaving like peg revs (issue #2602)
- * new '--accept' option for resolving conflicts batch-style (issue #2784)
      * easier to try out experimental ra_serf http:// access module
      * select ra_neon vs ra_serf on a site-by-site basis in config (r25535)
      * client-side post-commit processing now more efficient (issue #2607)

Property changes on: CHANGES
Added: svn:mergeinfo
    Merged /branches/svn-mergeinfo-enhancements/CHANGES:r30122

(Hmm, that's less than helpful. I expected to see only the revision merged
in r30329, not all the mergeinfo that was inherited, but now is explicit.
But, I digress...)

In r30329, I merged r30112 from trunk which touched both CHANGES and the release
notes. I didn't want to merge the release notes, because we no longer ship
www/ (with the exception of hacking.html) with the release tarballs. So I
cherry picked r30112 to CHANGES itself.

If it annoys us to have CHANGES modified for every commit to 1.5.x, does that
say something about how our users will feel?


Received on 2008-04-12 16:06:59 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.