Re: rebase pull/apply vs. pull/apply --rebase

Ben Franksen <[email protected]> Mon, 3 Feb 2020 23:35:29 +0100

Newsgroups	gmane.comp.version-control.darcs.user
Message-ID	<[email protected]>

Am 02.02.20 um 19:11 schrieb Ganesh Sittampalam:
> On 28/01/2020 10:37, Ben Franksen wrote:
>> It would be quite convenient to have a --rebase option for obliterate
>> that automatically suspends all patches that depend on the one(s) you
>> want to obliterate.
> 
>> Note that this is something completely different than 'rebase
>> obliterate' which is about obliterating suspended patches. So this is a
>> point where the strict rule "everything that affects rebase must be a
>> subcommand of rebase" breaks down.
> 
> FWIW this isn't really a strict rule anyway, in the sense that any darcs
> operation can create fixups - although not currently to add or remove
> suspended patches. I certainly don't see any problem with departing from it.

Okay, good.

>> To make it crystal clear what the expected behavior is, we could name
>> the option --suspend-conflicting. Commands from group (1) would remain
>> as they are. Commands from group (2) would get a different UI:
>>
>>   rebase pull -> pull --suspend-conflicting
>>   rebase apply -> apply --suspend-conflicting
> 
> Perhaps --suspend-local? I find that clearer and it would also allow
> --suspend-remote. But I remember we have discussed some of this before,
> and I can't remember what my opinion then was :-)

AFAIR your point used to be (and is now, I guess) that it should be
somehow made clear in which repo patches are suspended. And my response
now (and, I believe back then) is that patches are /obviously/ suspended
in the repo that receives new patches (local for pull and apply, remote
for push), because that is the only place where a conflict manifests itself.

BTW, bringing 'rebase apply' and 'rebase pull' back as options to apply
and pull could also simplify the internal mechanics a bit (see
PatchApplier etc).

>> We could then add
>>
>>   push --suspend-conflicting
>>
>> (which I have been proposing some time ago) and also a new option
>> --suspend-depending to get
>>
>>   obliterate --suspend-depending
>>   unrecord --suspend-depending
>>   amend --suspend-depending
>>
>> Or we could shorten both options to just --suspend for more uniformity
>> (and less typing) but less clarity.
> 
> I think all this would be good.

Good. (I am not promising to send patches any time soon...)

Cheers
Ben

_______________________________________________
darcs-users mailing list
[email protected]
https://lists.osuosl.org/mailman/listinfo/darcs-users

pEpkey.asc (application/pgp-keys, 4.1 KB)

-----BEGIN PGP PUBLIC KEY BLOCK-----

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
GF6YrmLTY+dHqfhltN5t8zUn4lVK9F8gPsFZ
=xdUk
-----END PGP PUBLIC KEY BLOCK-----