> Point 3 is not true. When you have two branches but only 1 topological
> head, you can only merge the topological head into the other branch.
> Trying to merge the other direction will fail because the other branch
> is already an ancestor.
Ah, thanks for the clarification
> Merging...
>
> -Original Message-
> From: Uwe Brauer
> Sent: Friday, July 21, 2023 8:25 AM
>
> What is a bit confusing, is:
>
> 1. Merging is allowed in both cases. If I had used bookmarks (or
>even topics, at least in the standard setting) then hg would have
>refused the merge,
>>> "RW" == Rainer Woitok writes:
Rainer,
> Uwe,
> On Friday, 2023-07-21 14:38:03 +0200, you wrote:
>> ...
>> What do I miss here? What I find confusing that hg diff displays in both
>> cases a conflicting difference but hg merge *ignores* in the first
>> example that conflict.
> Just run "hg
Uwe,
On Friday, 2023-07-21 14:38:03 +0200, you wrote:
> ...
> What do I miss here? What I find confusing that hg diff displays in both
> cases a conflicting difference but hg merge *ignores* in the first
> example that conflict.
Just run "hg log -G" on both your repositories :-)
Sincerely,
Hi
I run into a problem I don't fully understand.
Consider the following example
hg init hg-merge
cd hg-merge
hg branch master
echo 1 > test
hg add test
hg commit -m "First commit in master"
echo 1.1 > test
hg add .
hg commit -m "Second commit in master"
hg branch feature
echo 1.2 > test
hg add
I don't think we have. We should get a `pruned()` revset
On 7/21/23 10:52, Mitchell Elutovich wrote:
I am struggling to put together a hg log [only] command to show me
pruned changesets, is there a way to have a revset based on a textual
string/regex of the obsolete description?
My current
I am struggling to put together a hg log [only] command to show me pruned
changesets, is there a way to have a revset based on a textual string/regex
of the obsolete description?
My current solution is:
hg --hidden log -r "obsolete()" | grep -B 6 -A 1 "using prune"
