* [PATCH] Document git-svn's first-parent rule
@ 2009-11-16 10:15 Thomas Rast
2009-11-16 23:14 ` Eric Wong
0 siblings, 1 reply; 5+ messages in thread
From: Thomas Rast @ 2009-11-16 10:15 UTC (permalink / raw)
To: git; +Cc: Eric Wong
git-svn has the following rule to detect the SVN base for its
operations: find the first git-svn-id line reachable through
first-parent ancestry. IOW,
git log --grep=^git-svn-id: --first-parent -1
Document this, as it is very important when using merges with git-svn.
Signed-off-by: Thomas Rast <trast@student.ethz.ch>
---
Documentation/git-svn.txt | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
index 1812890..6da4151 100644
--- a/Documentation/git-svn.txt
+++ b/Documentation/git-svn.txt
@@ -735,6 +735,16 @@ merges you've made. Furthermore, if you merge or pull from a git branch
that is a mirror of an SVN branch, 'dcommit' may commit to the wrong
branch.
+If you do merge, note the following rule: 'git svn dcommit' will
+attempt to commit on top of the SVN commit named in
+------------------------------------------------------------------------
+git log --grep=^git-svn-id: --first-parent -1
+------------------------------------------------------------------------
+You 'must' therefore ensure that the most recent commit of the branch
+you want to dcommit to is the 'first' parent of the merge. Chaos will
+ensue otherwise, especially if the first parent is an older commit on
+the same SVN branch.
+
'git clone' does not clone branches under the refs/remotes/ hierarchy or
any 'git svn' metadata, or config. So repositories created and managed with
using 'git svn' should use 'rsync' for cloning, if cloning is to be done
--
1.6.5.2.427.ge73cb
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] Document git-svn's first-parent rule
2009-11-16 10:15 [PATCH] Document git-svn's first-parent rule Thomas Rast
@ 2009-11-16 23:14 ` Eric Wong
2009-11-17 6:25 ` Junio C Hamano
0 siblings, 1 reply; 5+ messages in thread
From: Eric Wong @ 2009-11-16 23:14 UTC (permalink / raw)
To: Junio C Hamano, Thomas Rast; +Cc: git
Thomas Rast <trast@student.ethz.ch> wrote:
> git-svn has the following rule to detect the SVN base for its
> operations: find the first git-svn-id line reachable through
> first-parent ancestry. IOW,
>
> git log --grep=^git-svn-id: --first-parent -1
>
> Document this, as it is very important when using merges with git-svn.
>
> Signed-off-by: Thomas Rast <trast@student.ethz.ch>
Thanks Thomas,
Acked-by: Eric Wong <normalperson@yhbt.net>
> ---
> Documentation/git-svn.txt | 10 ++++++++++
> 1 files changed, 10 insertions(+), 0 deletions(-)
>
> diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
> index 1812890..6da4151 100644
> --- a/Documentation/git-svn.txt
> +++ b/Documentation/git-svn.txt
> @@ -735,6 +735,16 @@ merges you've made. Furthermore, if you merge or pull from a git branch
> that is a mirror of an SVN branch, 'dcommit' may commit to the wrong
> branch.
>
> +If you do merge, note the following rule: 'git svn dcommit' will
> +attempt to commit on top of the SVN commit named in
> +------------------------------------------------------------------------
> +git log --grep=^git-svn-id: --first-parent -1
> +------------------------------------------------------------------------
> +You 'must' therefore ensure that the most recent commit of the branch
> +you want to dcommit to is the 'first' parent of the merge. Chaos will
> +ensue otherwise, especially if the first parent is an older commit on
> +the same SVN branch.
> +
> 'git clone' does not clone branches under the refs/remotes/ hierarchy or
> any 'git svn' metadata, or config. So repositories created and managed with
> using 'git svn' should use 'rsync' for cloning, if cloning is to be done
> --
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Document git-svn's first-parent rule
2009-11-16 23:14 ` Eric Wong
@ 2009-11-17 6:25 ` Junio C Hamano
2009-11-17 7:42 ` Eric Wong
0 siblings, 1 reply; 5+ messages in thread
From: Junio C Hamano @ 2009-11-17 6:25 UTC (permalink / raw)
To: Eric Wong; +Cc: Thomas Rast, git
Eric Wong <normalperson@yhbt.net> writes:
> Thomas Rast <trast@student.ethz.ch> wrote:
>> git-svn has the following rule to detect the SVN base for its
>> operations: find the first git-svn-id line reachable through
>> first-parent ancestry. IOW,
>>
>> git log --grep=^git-svn-id: --first-parent -1
>>
>> Document this, as it is very important when using merges with git-svn.
>>
>> Signed-off-by: Thomas Rast <trast@student.ethz.ch>
>
> Thanks Thomas,
>
> Acked-by: Eric Wong <normalperson@yhbt.net>
Thanks; is it a good time to pull from your bogomips repository to get
accumulated changes?
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Document git-svn's first-parent rule
2009-11-17 6:25 ` Junio C Hamano
@ 2009-11-17 7:42 ` Eric Wong
2009-11-17 18:25 ` Junio C Hamano
0 siblings, 1 reply; 5+ messages in thread
From: Eric Wong @ 2009-11-17 7:42 UTC (permalink / raw)
To: Junio C Hamano; +Cc: Thomas Rast, git
Junio C Hamano <gitster@pobox.com> wrote:
> Eric Wong <normalperson@yhbt.net> writes:
>
> > Thomas Rast <trast@student.ethz.ch> wrote:
> >> git-svn has the following rule to detect the SVN base for its
> >> operations: find the first git-svn-id line reachable through
> >> first-parent ancestry. IOW,
> >>
> >> git log --grep=^git-svn-id: --first-parent -1
> >>
> >> Document this, as it is very important when using merges with git-svn.
> >>
> >> Signed-off-by: Thomas Rast <trast@student.ethz.ch>
> >
> > Thanks Thomas,
> >
> > Acked-by: Eric Wong <normalperson@yhbt.net>
>
> Thanks; is it a good time to pull from your bogomips repository to get
> accumulated changes?
Now is, I just pushed to it:
Eric Wong (3):
git svn: read global+system config for clone+init
git svn: add authorsfile test case for ~/.gitconfig
git svn: attempt to create empty dirs on clone+rebase
Thomas Rast (1):
Document git-svn's first-parent rule
Toby Allsopp (1):
git svn: handle SVN merges from revisions past the tip of the branch
HEAD=ce45a45f24cc7b3ccc7f6ebcd0025559b4421bda
--
Eric Wong
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] Document git-svn's first-parent rule
2009-11-17 7:42 ` Eric Wong
@ 2009-11-17 18:25 ` Junio C Hamano
0 siblings, 0 replies; 5+ messages in thread
From: Junio C Hamano @ 2009-11-17 18:25 UTC (permalink / raw)
To: Eric Wong; +Cc: Junio C Hamano, Thomas Rast, git
Eric Wong <normalperson@yhbt.net> writes:
>> Thanks; is it a good time to pull from your bogomips repository to get
>> accumulated changes?
>
> Now is, I just pushed to it:
>
> Eric Wong (3):
> git svn: read global+system config for clone+init
> git svn: add authorsfile test case for ~/.gitconfig
> git svn: attempt to create empty dirs on clone+rebase
>
> Thomas Rast (1):
> Document git-svn's first-parent rule
>
> Toby Allsopp (1):
> git svn: handle SVN merges from revisions past the tip of the branch
>
> HEAD=ce45a45f24cc7b3ccc7f6ebcd0025559b4421bda
Thanks, pulled.
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2009-11-17 18:25 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-11-16 10:15 [PATCH] Document git-svn's first-parent rule Thomas Rast
2009-11-16 23:14 ` Eric Wong
2009-11-17 6:25 ` Junio C Hamano
2009-11-17 7:42 ` Eric Wong
2009-11-17 18:25 ` Junio C Hamano
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.