Hi,

Am Freitag, den 26.10.2012, 23:23 +0000 schrieb [email protected]:
> Fri Oct 26 23:05:10 UTC 2012  [email protected]
>   * redo experimental changes again
>   Ignore-this: 9118d8baaf94bc453494b6479901fed2
>   
>   I think this is why people use branches..
> 
>     M ./changelog +6
>     M ./control -1 +1

you don’t need to undo the changes and redo them later. What I do in
this case is:

* darcs pull
* darcs obliterate 
# select the experimental changes and remove them from my repo
# do whatever I want to do with unstable
* darcs record
* darcs tag
# Now we have a separate, anonymous, local branch
* darcs pull
# This will introduce conflicts in changelog, which we resolve in
whatever way makes most sense to us
* darcs record -m "Merge unstable and experimental branch"

So there are branches. The next person who wants to work from the
unstable status can then obliterate everything up to the last unstable
patch to get that state again.

Greetings,
Joachim

-- 
Joachim "nomeata" Breitner
Debian Developer
  [email protected] | ICQ# 74513189 | GPG-Keyid: 4743206C
  JID: [email protected] | http://people.debian.org/~nomeata

Attachment: signature.asc
Description: This is a digitally signed message part

Reply via email to