merging unrelated branches
jelmer at vernstok.nl
Tue Dec 23 10:10:46 GMT 2008
Am Montag, den 22.12.2008, 23:08 -0500 schrieb Stefan Monnier:
> >>> (you have to specify the revision range manually since there is no
> >>> common ancestor)
> >> Once this happens, do they then have a common ancestor
> > Yes: the revision you merged (and all its ancestors) will be common.
> Indeed, but another issue is important: can the merge mark files from
> each branch as being "the same"? I.e. if I have foo/bar in one branch
> and foo/bar in the other, can the merge result (via some conflict
> resolution) in Bzr knowing that these are "the same file" so that
> changes to foo/bar in either branch will be merged into the foo/bar of
> the merged branch?
> In Arch, this was easy to do by setting the arch-tag (or the
> .arch-ids/foo.id file) accordingly, but since file-identities seem to be
I'm not familiar with arch, but was that feature called "file id
aliases" ? Or is that something different entirely ?
More information about the bazaar