[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Rewriting bzrmerge.el

From: David Engster
Subject: Re: Rewriting bzrmerge.el
Date: Sat, 22 Nov 2014 17:13:29 +0100
User-agent: Gnus/5.13001 (Ma Gnus v0.10) Emacs/24.3.91 (gnu/linux)

Eli Zaretskii writes:
> What are the assumptions about the location of the release branch?  Do
> you assume the release branch is in the same cloned repo as master, or
> are there provisions for having the branch in another clone?

As long as you use git-new-workdir, that shouldn't matter. The 'trunk'
checkout should also have a local tracking branch
'emacs-24'. Alternatively, we could default to merge origin/emacs-24,
which wouldn't even require a local tracking branch.


reply via email to

[Prev in Thread] Current Thread [Next in Thread]