[Haskell-cafe] Why not Darcs?
Maciej Marcin Piechotka
uzytkownik2 at gmail.com
Fri Apr 22 02:31:27 CEST 2011
On Thu, 2011-04-21 at 19:19 -0500, Jake McArthur wrote:
> On Thu, Apr 21, 2011 at 6:32 PM, Maciej Marcin Piechotka
> <uzytkownik2 at gmail.com> wrote:
> > Assume following changes
> > 1. Feature X - file x.hs
> > 2. Feature Y - file y.hs and x.hs
> > 3. Feature Z - file z.hs and x.hs
> > 4. Fix to feature Y (changes x.hs)
> > 5. Fix to feature X (changes x.hs)
> >
> > Now before pushing I would like to have 3 nice commits. In git I can
> > rewrite history by single command:
> >
> > # git rebase -i origin/master
> >
> > and edit the file to look like
> >
> > pick 1
> > fixup 5
> > pick 2
> > fixup 4
> > pick 3
> >
> > Manually/automatically check everything is ok.
>
> % darcs unrec -a -p 'Fix to feature X'
> Finished unrecording.
> % darcs amend -a -p 'Feature X'
> Thu Apr 21 19:11:54 CDT 2011 Jake McArthur <Jake.McArthur at gmail.com>
> * Feature X
> Shall I amend this patch? [yN...], or ? for more options: y
> Finished amending patch:
> Thu Apr 21 19:14:41 CDT 2011 Jake McArthur <Jake.McArthur at gmail.com>
> * Feature X
> % darcs unrec -a -p 'Fix to feature Y'
> Finished unrecording.
> % darcs amend -a -p 'Feature Y'
> Thu Apr 21 19:12:12 CDT 2011 Jake McArthur <Jake.McArthur at gmail.com>
> * Feature Y
> Shall I amend this patch? [yN...], or ? for more options: y
> Finished amending patch:
> Thu Apr 21 19:14:50 CDT 2011 Jake McArthur <Jake.McArthur at gmail.com>
> * Feature Y
>
> - Jake
Last time I checked it disallowed my as 5 depended on 4 which depended
on 3 which depended on 2 which depended on 1 as all changed x.hs:
Fri Apr 22 02:30:03 CEST 2011 Maciej Piechotka <uzytkownik2 at gmail.com>
* Y feature
Shall I amend this patch? [yN...], or ? for more options: n
Skipping depended-upon patch:
Fri Apr 22 02:29:27 CEST 2011 Maciej Piechotka <uzytkownik2 at gmail.com>
* Feature X
Cancelling amend since no patch was selected.
Regards
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 836 bytes
Desc: This is a digitally signed message part
URL: <http://www.haskell.org/pipermail/haskell-cafe/attachments/20110422/4a19b408/attachment.pgp>
More information about the Haskell-Cafe
mailing list