mirrors/git - Incest Forge: Beyond sex. We incest.

mirrors/git

mirror of https://github.com/git/git.git synced 2024-11-06 09:13:01 +01:00

375 lines

4.8 KiB

Text

Raw Normal View History

git-svn: teach git-svn to populate svn:mergeinfo Allow git-svn to populate the svn:mergeinfo property automatically in a narrow range of circumstances. Specifically, when dcommitting a revision with multiple parents, all but (potentially) the first of which have been committed to SVN in the same repository as the target of the dcommit. In this case, the merge info is the union of that given by each of the parents, plus all changes introduced to the first parent by the other parents. In all other cases where a revision to be committed has multiple parents, cause "git svn dcommit" to raise an error rather than completing the commit and potentially losing history information in the upstream SVN repository. This behavior is disabled by default, and can be enabled by setting the svn.pushmergeinfo config option. [ew: minor style changes and manpage merge fix] Acked-by: Eric Wong <normalperson@yhbt.net> Signed-off-by: Bryan Jacobs <bjacobs@woti.com> 2011-09-07 19:36:05 +02:00			`SVN-fs-dump-format-version: 2`

			`UUID: 1ef08553-f2d1-45df-b38c-19af6b7c926d`

			`Revision-number: 0`
			`Prop-content-length: 56`
			`Content-length: 56`

			`K 8`
			`svn:date`
			`V 27`
			`2011-09-02T16:08:02.941384Z`
			`PROPS-END`

			`Revision-number: 1`
			`Prop-content-length: 114`
			`Content-length: 114`

			`K 7`
			`svn:log`
			`V 12`
			`Base commit`

			`K 10`
			`svn:author`
			`V 7`
			`bjacobs`
			`K 8`
			`svn:date`
			`V 27`
			`2011-09-02T16:08:27.205062Z`
			`PROPS-END`

			`Node-path: branches`
			`Node-kind: dir`
			`Node-action: add`
			`Prop-content-length: 10`
			`Content-length: 10`

			`PROPS-END`


			`Node-path: trunk`
			`Node-kind: dir`
			`Node-action: add`
			`Prop-content-length: 10`
			`Content-length: 10`

			`PROPS-END`


			`Revision-number: 2`
			`Prop-content-length: 121`
			`Content-length: 121`

			`K 7`
			`svn:log`
			`V 19`
			`Create branch svnb1`
			`K 10`
			`svn:author`
			`V 7`
			`bjacobs`
			`K 8`
			`svn:date`
			`V 27`
			`2011-09-02T16:09:43.628137Z`
			`PROPS-END`

			`Node-path: branches/svnb1`
			`Node-kind: dir`
			`Node-action: add`
			`Node-copyfrom-rev: 1`
			`Node-copyfrom-path: trunk`


			`Revision-number: 3`
			`Prop-content-length: 121`
			`Content-length: 121`

			`K 7`
			`svn:log`
			`V 19`
			`Create branch svnb2`
			`K 10`
			`svn:author`
			`V 7`
			`bjacobs`
			`K 8`
			`svn:date`
			`V 27`
			`2011-09-02T16:09:46.339930Z`
			`PROPS-END`

			`Node-path: branches/svnb2`
			`Node-kind: dir`
			`Node-action: add`
			`Node-copyfrom-rev: 1`
			`Node-copyfrom-path: trunk`


			`Revision-number: 4`
			`Prop-content-length: 121`
			`Content-length: 121`

			`K 7`
			`svn:log`
			`V 19`
			`Create branch svnb3`
			`K 10`
			`svn:author`
			`V 7`
			`bjacobs`
			`K 8`
			`svn:date`
			`V 27`
			`2011-09-02T16:09:49.394515Z`
			`PROPS-END`

			`Node-path: branches/svnb3`
			`Node-kind: dir`
			`Node-action: add`
			`Node-copyfrom-rev: 1`
			`Node-copyfrom-path: trunk`


			`Revision-number: 5`
			`Prop-content-length: 121`
			`Content-length: 121`

			`K 7`
			`svn:log`
			`V 19`
			`Create branch svnb4`
			`K 10`
			`svn:author`
			`V 7`
			`bjacobs`
			`K 8`
			`svn:date`
			`V 27`
			`2011-09-02T16:09:54.114607Z`
			`PROPS-END`

			`Node-path: branches/svnb4`
			`Node-kind: dir`
			`Node-action: add`
			`Node-copyfrom-rev: 1`
			`Node-copyfrom-path: trunk`


			`Revision-number: 6`
			`Prop-content-length: 121`
			`Content-length: 121`

			`K 7`
			`svn:log`
			`V 19`
			`Create branch svnb5`
			`K 10`
			`svn:author`
			`V 7`
			`bjacobs`
			`K 8`
			`svn:date`
			`V 27`
			`2011-09-02T16:09:58.602623Z`
			`PROPS-END`

			`Node-path: branches/svnb5`
			`Node-kind: dir`
			`Node-action: add`
			`Node-copyfrom-rev: 1`
			`Node-copyfrom-path: trunk`


			`Revision-number: 7`
			`Prop-content-length: 110`
			`Content-length: 110`

			`K 7`
			`svn:log`
			`V 9`
			`b1 commit`
			`K 10`
			`svn:author`
			`V 7`
			`bjacobs`
			`K 8`
			`svn:date`
			`V 27`
			`2011-09-02T16:10:20.292369Z`
			`PROPS-END`

			`Node-path: branches/svnb1/b1file`
			`Node-kind: file`
			`Node-action: add`
			`Prop-content-length: 10`
			`Text-content-length: 0`
			`Text-content-md5: d41d8cd98f00b204e9800998ecf8427e`
			`Text-content-sha1: da39a3ee5e6b4b0d3255bfef95601890afd80709`
			`Content-length: 10`

			`PROPS-END`


			`Revision-number: 8`
			`Prop-content-length: 110`
			`Content-length: 110`

			`K 7`
			`svn:log`
			`V 9`
			`b2 commit`
			`K 10`
			`svn:author`
			`V 7`
			`bjacobs`
			`K 8`
			`svn:date`
			`V 27`
			`2011-09-02T16:10:38.429199Z`
			`PROPS-END`

			`Node-path: branches/svnb2/b2file`
			`Node-kind: file`
			`Node-action: add`
			`Prop-content-length: 10`
			`Text-content-length: 0`
			`Text-content-md5: d41d8cd98f00b204e9800998ecf8427e`
			`Text-content-sha1: da39a3ee5e6b4b0d3255bfef95601890afd80709`
			`Content-length: 10`

			`PROPS-END`


			`Revision-number: 9`
			`Prop-content-length: 110`
			`Content-length: 110`

			`K 7`
			`svn:log`
			`V 9`
			`b3 commit`
			`K 10`
			`svn:author`
			`V 7`
			`bjacobs`
			`K 8`
			`svn:date`
			`V 27`
			`2011-09-02T16:10:52.843023Z`
			`PROPS-END`

			`Node-path: branches/svnb3/b3file`
			`Node-kind: file`
			`Node-action: add`
			`Prop-content-length: 10`
			`Text-content-length: 0`
			`Text-content-md5: d41d8cd98f00b204e9800998ecf8427e`
			`Text-content-sha1: da39a3ee5e6b4b0d3255bfef95601890afd80709`
			`Content-length: 10`

			`PROPS-END`


			`Revision-number: 10`
			`Prop-content-length: 110`
			`Content-length: 110`

			`K 7`
			`svn:log`
			`V 9`
			`b4 commit`
			`K 10`
			`svn:author`
			`V 7`
			`bjacobs`
			`K 8`
			`svn:date`
			`V 27`
			`2011-09-02T16:11:17.489870Z`
			`PROPS-END`

			`Node-path: branches/svnb4/b4file`
			`Node-kind: file`
			`Node-action: add`
			`Prop-content-length: 10`
			`Text-content-length: 0`
			`Text-content-md5: d41d8cd98f00b204e9800998ecf8427e`
			`Text-content-sha1: da39a3ee5e6b4b0d3255bfef95601890afd80709`
			`Content-length: 10`

			`PROPS-END`


			`Revision-number: 11`
			`Prop-content-length: 110`
			`Content-length: 110`

			`K 7`
			`svn:log`
			`V 9`
			`b5 commit`
			`K 10`
			`svn:author`
			`V 7`
			`bjacobs`
			`K 8`
			`svn:date`
			`V 27`
			`2011-09-02T16:11:32.277404Z`
			`PROPS-END`

			`Node-path: branches/svnb5/b5file`
			`Node-kind: file`
			`Node-action: add`
			`Prop-content-length: 10`
			`Text-content-length: 0`
			`Text-content-md5: d41d8cd98f00b204e9800998ecf8427e`
			`Text-content-sha1: da39a3ee5e6b4b0d3255bfef95601890afd80709`
			`Content-length: 10`

			`PROPS-END`


			`Revision-number: 12`
			`Prop-content-length: 192`
			`Content-length: 192`

			`K 7`
			`svn:log`
			`V 90`
			`Merge remote-tracking branch 'svnb5' into HEAD`

			`* svnb5:`
			`b5 commit`
			`Create branch svnb5`
			`K 10`
			`svn:author`
			`V 7`
			`bjacobs`
			`K 8`
			`svn:date`
			`V 27`
			`2011-09-02T16:11:54.274722Z`
			`PROPS-END`

			`Node-path: branches/svnb4`
			`Node-kind: dir`
			`Node-action: change`
			`Prop-content-length: 56`
			`Content-length: 56`

			`K 13`
			`svn:mergeinfo`
			`V 21`
			`/branches/svnb5:6,11`

			`PROPS-END`


			`Node-path: branches/svnb4/b5file`
			`Node-kind: file`
			`Node-action: add`
			`Prop-content-length: 10`
			`Text-content-length: 0`
			`Text-content-md5: d41d8cd98f00b204e9800998ecf8427e`
			`Text-content-sha1: da39a3ee5e6b4b0d3255bfef95601890afd80709`
			`Content-length: 10`

			`PROPS-END`