[prev in list] [next in list] [prev in thread] [next in thread] 

List:       darcs-devel
Subject:    [darcs-devel] [issue2552] darcs rebase unsuspend --all should stop at the first	conflict
From:       Daniel Wilson-Thomas <bugs () darcs ! net>
Date:       2017-12-18 14:33:15
Message-ID: 1513607595.84.0.327218893857.issue2552 () darcs ! net
[Download RAW message or body]


Daniel Wilson-Thomas <danielwilsonthomas@gmail.com> added the comment:

Without this, it seems pretty easy to lose track of the changes you amended into a \
previous patch which  has dependents.

For example, the following sequence of commands results in a state that, while all \
the information seems  to present in some form, looks like it's lost some \
information.

darcs init
echo "Some text here" > file1
darcs record -m "Gonna edit this later" -a -l
echo "Some more text" >> file1
darcs record -m "Gonna suspend this 1" -a
echo "Suspending two" >> file1
darcs record -m "Gonna suspend this 2" -a
darcs rebase suspend -p "Gonna suspend this" --no-interactive
echo "Edited this" >> file1
darcs amend --record --all # Amend into "edit this" patch
darcs rebase unsuspend --all

After this sequence of commands (the only one I couldn't make non-interactive seemed \
to be the amend- record) there are some conflict markers in file1, but the the \
"Edited this" text is not in those conflict  markers. Here's the contents of file1:

# file1:
Some text here
v v v v v v v
Some more text
=============
*************
Some more text
Suspending two
^ ^ ^ ^ ^ ^ ^

And here's the output of darcs log -v

patch 11abf7f827912edd2481c2cd46da2ebd449bdedc
Author: danielwilsonthomas.com
Date:   Mon Dec 18 08:52:00 EST 2017
  * Gonna suspend this 2
    hunk ./file1 2
    +Some more text

patch d6ebc481d5bfab4de5f3485fcb8b044f7016d6b9
Author: danielwilsonthomas.com
Date:   Mon Dec 18 08:52:00 EST 2017
  * Gonna suspend this 1
    hunk ./file1 2
    -Edited this

patch 6c0bdc6a6ae82d78b3cc5d1e34f3e5da7d3cf36e
Author: danielwilsonthomas.com
Date:   Mon Dec 18 08:51:51 EST 2017
  * Gonna edit this later
    addfile ./file1
    hunk ./file1 1
    +Some text here
    +Edited this

You can see the line was removed in the "Gonna suspend this 1" patch.

__________________________________
Darcs bug tracker <bugs@darcs.net>
<http://bugs.darcs.net/issue2552>
__________________________________
_______________________________________________
darcs-devel mailing list
darcs-devel@osuosl.org
https://lists.osuosl.org/mailman/listinfo/darcs-devel


[prev in list] [next in list] [prev in thread] [next in thread]