From: Sam Vilain <sam@vilain•net>
To: Jakub Narebski <jnareb@gmail•com>
Cc: Matthias Andree <matthias.andree@gmx•de>,
git@vger•kernel.org, Matthieu Moy <Matthieu.Moy@imag•fr>
Subject: Re: Merging in Subversion 1.5 (was: Re: Using git to track my PhD thesis, couple of questions)
Date: Mon, 31 Aug 2009 07:41:56 +1200 [thread overview]
Message-ID: <1251661316.25764.4.camel@maia.lan> (raw)
In-Reply-To: <m3ocq0km5m.fsf_-_@localhost.localdomain>
On Fri, 2009-08-28 at 08:12 -0700, Jakub Narebski wrote:
> * svn:mergeinfo contains _per-file_ merge info, so it is much, much
> more "chatty" than Git multiple parents.
It can. But more often, if you're merging complete paths, you will get
complete revision ranges.
See eg
https://trac.parrot.org/parrot/browser/trunk
Note how trac is also hiding the branches that were subsequently deleted
from the mergeinfo ticket.
> * The command to merge trunk into branch is different from command to
> merge branch into trunk.
This is a caveat of url-based branches.
> Also IIRC there is warning (well, at least there was in Subversion 1.5
> release notes) that merge tracking doesn't work entirely correctly in
> the face of criss-cross merges (multiple merge bases) and renaming
> (although I do hope that they fixed problem with silent corruption if
> there is rename during merge).
Not sure about that one. I also heard - unconfirmed - that things start
to go awry if you start branching off branches and merging around the
place. But if that happens it's likely a bug rather than a design flaw
(I think).
Sam
next prev parent reply other threads:[~2009-08-30 19:42 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-08-27 20:34 Using git to track my PhD thesis, couple of questions seanh
2009-08-27 20:41 ` Sverre Rabbelier
2009-08-27 20:55 ` Matthieu Moy
2009-08-28 8:34 ` Paolo Bonzini
2009-08-28 8:46 ` Matthieu Moy
2009-08-27 21:38 ` Junio C Hamano
2009-08-27 22:21 ` demerphq
2009-08-28 13:37 ` seanh
2009-08-28 13:51 ` Matthieu Moy
2009-08-28 13:54 ` Matthias Andree
2009-08-28 15:12 ` Merging in Subversion 1.5 (was: Re: Using git to track my PhD thesis, couple of questions) Jakub Narebski
2009-08-28 15:29 ` Avery Pennarun
2009-08-28 15:44 ` Matthias Andree
2009-08-28 16:19 ` Merging in Subversion 1.5 Jakub Narebski
2009-08-28 16:28 ` Matthias Andree
2009-08-28 16:34 ` Avery Pennarun
2009-08-30 19:41 ` Sam Vilain [this message]
2009-08-31 5:47 ` Merging in Subversion 1.5 (was: Re: Using git to track my PhD thesis, couple of questions) Dmitry Potapov
2009-08-28 21:42 ` Using git to track my PhD thesis, couple of questions david
2009-08-28 15:50 ` Paolo Bonzini
2009-08-28 16:12 ` demerphq
2009-08-28 21:44 ` david
2009-08-28 22:16 ` demerphq
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1251661316.25764.4.camel@maia.lan \
--to=sam@vilain$(echo .)net \
--cc=Matthieu.Moy@imag$(echo .)fr \
--cc=git@vger$(echo .)kernel.org \
--cc=jnareb@gmail$(echo .)com \
--cc=matthias.andree@gmx$(echo .)de \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox