From: Juanma Barranquero <lekktu@gmail.com>
To: Jason Rumney <jasonr@gnu.org>
Cc: emacs-devel@gnu.org
Subject: Re: bzr handholding: restoring deleted file
Date: Fri, 8 Jan 2010 11:38:13 +0100 [thread overview]
Message-ID: <f7ccd24b1001080238g5342abb7y5a65120eb9b04799@mail.gmail.com> (raw)
In-Reply-To: <4B46BBB9.2030900@gnu.org>
On Fri, Jan 8, 2010 at 05:59, Jason Rumney <jasonr@gnu.org> wrote:
> cd emacs/trunk
> bzr update
> cd ../quickfixes
> bzr commit
> bzr merge
> ... resolve conflicts
> bzr commit
> ... continue working
You could use shelve/unshelve and at least not be forced to commit
your changes before merging the trunk.
> Compared with the CVS case:
> cvs update
> ...resolve conflicts
> ...continue working
Well, if your change is really a quickfix, you can do it on the trunk,
and then the same workflow will apply:
cd emacs/trunk
...hack hack hack
bzr update
...resolve conflicts
bzr commit -m "My quick fix"
though of course that is not recommended if the quickfix is
susceptible of turning into a slowfix with multiple commits.
Juanma
next prev parent reply other threads:[~2010-01-08 10:38 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-01-08 0:21 bzr handholding: restoring deleted file Glenn Morris
2010-01-08 0:45 ` Dan Nicolaescu
2010-01-08 0:51 ` Glenn Morris
2010-01-08 0:54 ` Dan Nicolaescu
2010-01-08 1:11 ` Jason Earl
[not found] ` <20100108004050.GB1426@fencepost.localnet>
2010-01-08 0:50 ` Glenn Morris
2010-01-08 4:59 ` Jason Rumney
2010-01-08 10:38 ` Juanma Barranquero [this message]
2010-01-08 9:24 ` Eli Zaretskii
2010-01-08 10:42 ` Juanma Barranquero
2010-01-08 12:31 ` Eli Zaretskii
2010-01-08 13:09 ` Juanma Barranquero
2010-01-08 17:37 ` Stefan Monnier
2010-01-08 19:29 ` Eli Zaretskii
2010-01-08 21:15 ` Glenn Morris
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=f7ccd24b1001080238g5342abb7y5a65120eb9b04799@mail.gmail.com \
--to=lekktu@gmail.com \
--cc=emacs-devel@gnu.org \
--cc=jasonr@gnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/emacs.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).