[prev in list] [next in list] [prev in thread] [next in thread] 

List:       subversion-commits
Subject:    =?utf-8?q?=5BSubversion_Wiki=5D_Update_of_=22MergeinfoCommand=22_by_Julia?= =?utf-8?q?nFoad?=
From:       Apache subversion Wiki <commits () subversion ! apache ! org>
Date:       2012-10-31 12:26:27
Message-ID: 20121031122627.51556.51125 () eos ! apache ! org
[Download RAW message or body]

Dear Wiki user,

You have subscribed to a wiki page or wiki category on "Subversion Wiki" for change \
notification.

The "MergeinfoCommand" page has been changed by JulianFoad:
http://wiki.apache.org/subversion/MergeinfoCommand?action=diff&rev1=10&rev2=11

   * No machine-readable output; consider adding it (--xml?) in future.
  
  == Examples ==
- === Early Ideas -- Textual Summary ===
- In a WC of ''feature branch'' "B", which has had catch-ups through trunk@1234 \
                except trunk@1215:
- 
-  * Mergeinfo summary:
-  {{{
- $ svn mergeinfo ^/trunk
- Origin: /branches/B@1200 (from /trunk@1190)
- Merged from ^/trunk:
-    Origin-1214, 1216-1234
- }}}
-  /!\ ''cmpilato: Don't capitalize "Origin" in the revision list, and consider using \
                the 'r' prefix on all revisions in ranges (here and elsewhere).''
- 
-  * Automatic identification of the ''parent'' branch:
-  {{{
- $ svn mergeinfo
- Parent branch is ^/trunk.
- }}}
-  [... continue as for "svn mergeinfo ^/trunk" …]
-  /!\ ''cmpilato: If the continuation carries an "Origin:" line that says "from \
                /trunk@1190", does the "Parent branch is ..." line truly add \
                information?''
- 
-  /!\ ''julianf: I don't any longer like this idea of selecting a "parent  branch" \
and guessing that that's the branch the user wants to merge to  or from. Or at least \
                that idea isn't sufficiently well developed.''
- 
-  * Failed to identify a parent branch:
-  {{{
- $ svn mergeinfo
- svn: No parent branch configured for ^/branches/B
- }}}
-  /!\ ''julianf: Ditto: forget this.''
- 
-  * When no relationship is configured between this and the specified branch:
-  {{{
- $ svn mergeinfo ^/branches/B2
- No declared relationship between /branches/B and /branches/B2.
- Merged from ^/branches/B2:
-    905,970-977
- }}}
-  /!\ ''cmpilato: As a user, my first thought would be, "How do I 'declare' a \
                relationship between these branches?"''
- 
-  /!\ ''julianf: Ditto: forget this.''
- 
  === Error Conditions ===
   * When the source and target are not related:
   {{{
- $ svn mergeinfo ^/trunk/subdir
- (error about ^/trunk/subdir and ^/branches/B being unrelated)
+ $ svn mergeinfo ^/branches/A/sub/dir ^/branches/B
+ svn: E205000: Source and target must be different but related branches
+ svn: E205000: Source and target have no common ancestor:
+ 'https://.../branches/A/sub/dir@head' and 'https://.../branches/B@head'
  }}}
  
  === Subtree Mergeinfo ===


[prev in list] [next in list] [prev in thread] [next in thread]