Hi
I tried out, in a small git repository, emacs's
vc-region-history
It quite nice and useful but supports only git where it relies on
«git log -L»
I am not aware of any hg equivalent, but may be there is, or it is planned?
Regards
Uwe Brauer
--
I strongly condemn Putin's war
Hi
I tried out, in a small git repository, emacs's
vc-region-history
It quite nice and useful but supports only git where it relies on
«git log -L»
I am not aware of any hg equivalent, but may be there is, or it is planned?
Regards
Uwe Brauer
--
I strongly condemn Putin's war
it or cd $HOME/src/emacs-git/src (or wherever you
have your source code) and run./emacs
Regards
Uwe Brauer
--
I strongly condemn Putin's war of aggression against the Ukraine.
I support to deliver weapons to Ukraine's military.
I support the ban of Russia from SWIFT.
I support
it or cd $HOME/src/emacs-git/src (or wherever you
have your source code) and run./emacs
Regards
Uwe Brauer
--
I strongly condemn Putin's war of aggression against the Ukraine.
I support to deliver weapons to Ukraine's military.
I support the ban of Russia from SWIFT.
I support
tax to run this command from the command line?
I am asking since I want to configure an emacs variable of a certain package
But $: hg !TMP=$($HG root) $HG histedit "$@"
Does not work
Regards
Uwe Brauer
--
I strongly condemn Putin's war of aggression against the Ukraine.
I support to deliver
Uwe Brauer
--
I strongly condemn Putin's war of aggression against the Ukraine.
I support to deliver weapons to Ukraine's military.
I support the ban of Russia from SWIFT.
I support the EU membership of the Ukraine.
--
I strongly condemn Putin's war of aggression against the Ukraine.
I
-log-edit-mode so I don't have the usual emacs support.
I am not sure how many emacs users are on this list, but if they are I'd
love to hear about their workflow.
I also tried monky a bit, but it is not very intuitive at least not for me.
Uwe Brauer
--
I strongly condemn Putin's war
> Hm I am not sure.
> Hg log -G gives
> changeset: 56:2b273979d636
> │ tag: tip
> │ user: Uwe Brauer
> │ date:Wed Aug 10 17:13:45 2022 +0200
> │ instability: orphan
> │ summary: Set up the exterior files, so that they can be c
se they will show in the log -G output. They mean that the changeset has
> become unstable due to evolve changes. They can usually be resolve by
> running hg evolve.
Hm I am not sure.
Hg log -G gives
changeset: 56:2b273979d636
│ tag: tip
│ user:Uwe Brauer
│ date:
: 56:2b273979d636
│ Branch: default
│ tag: tip
│ Author: Uwe Brauer
│ Date:Wed, 10 Aug 2022 17:13:45 +0200
│ Phase: draft
│ Summary: Set up the exterior files, so that they can be compiled. Solve
markup questions
│
∗ changeset: 55:8d95b4026b39
>>> "GR" == Georges Racinet writes:
> On 01/08/2022 13:41, Uwe Brauer wrote:
>> Hi
>>
>> Does somebody know about an emacs package that supports
>>
>> hg commit -i
>>
>> Or shelve for that matter?
> I would love to see that
>>> "UB" == Uwe Brauer writes:
> Hi
> Does somebody know about an emacs package that supports
> hg commit -i
> Or shelve for that matter?
> Monky which is supposed a magit clone, does not.
https://porkrind.org/commit-patch/
Seems to come quite clo
Hi
Does somebody know about an emacs package that supports
hg commit -i
Or shelve for that matter?
Monky which is supposed a magit clone, does not.
Regards
Uwe Brauer
--
I strongly condemn Putin's war of aggression against the Ukraine.
I support to deliver weapons to Ukraine's
-repository-shared
And have the following entry in the .hgignore file
main-repository-shared
But could this cause trouble?
Uwe Brauer
--
I strongly condemn Putin's war of aggression against the Ukraine.
I support to deliver weapons to Ukraine's military.
I support the ban of Russia from SWIFT.
I
>>> "JT" == Johannes Totz writes:
> On 17/06/2022 08:36, Uwe Brauer wrote:
>> Hi
>> I am on Ubuntu 16.04 with hg 5.2
>> I did a local clone using
>> hg clone -b default
>> /home/oub/ALLES/HGs/tex/vorlesungen/HGQuim-Examenes
>> But th
I have a named branch with secret changesets in the source repository
I locally cloned it just for testing,
However in the cloned repository, the secret changesets were present.
(Ubuntu 16.04 hg 5.2)
Is this a bug or what do I miss?
Thanks
Uwe Brauer
--
I strongly condemn Putin's war
153:71e7e0654667 (inactive)
examjun17152:9376a2cadf4a (inactive)
I am confused.
Uwe Brauer
___
Mercurial mailing list
Mercurial@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial
+0200
│ Topic: feature
│ Phase: draft
│ Summary: Second
│
○ changeset: 0:591ed95cc981
Branch: default
Author: Bernhard Riemann
Date:Sun, 22 May 2022 14:08:39 +0200
Phase: draft
Summary: First
How can I avoid to have topics on two differ
>>> "BMJ" == Becker, Mischa J writes:
> Graft has a --force option. Have you tried that?
No, I did not, ha, that indeed works, thanks
smime.p7s
Description: S/MIME cryptographic signature
___
Mercurial mailing list
Mercurial@mercurial-scm.org
Hi
Without realising it, I have quite a bit of changesets on the wrong named
branch. So my graph looks like
◍ changeset: 368:072bfc0424f6
│ Branch: mac
│ tag: tip
│ Author: Uwe Brauer
│ Date:Fri, 29 Apr 2022 10:22:43 +0200
│ Topic: hacks
│ Phase
>>> "NG" == Norman Gray writes:
Hello Norman,
> Uwe, hello.
> On 13 Apr 2022, at 20:20, Uwe Brauer wrote:
>>> It originates from Atlassian, and I think they stopped
>>> showing it much love around the time they dropped Mercurial support
>&
>>> "NG" == Norman Gray writes:
> Uwe, hello.
> On 11 Apr 2022, at 21:37, Uwe Brauer wrote:
>> Does anybody have experience with the GUI sourcetree and mercurial?
>> I would like to test it for a colleague (in the hope to convince him to
>> use
>>> "BMJ" == Becker, Mischa J writes:
> I don't use sourcetree but based on
> https://www.mercurial-scm.org/wiki/MissingRequirement it appears that
> sourcetree is using a version of mercurial < 4.7 for that hg status
> command while the repository was created with a version of mercurial
>> =
kb/upgrading-git-mercurial-in-sourcetree-for-windows-695108075.html
Thanks, that looks useful
But I also found that
[format]
sparse-revlog = no
solves the issue
Uwe Brauer
smime.p7s
Description: S/MIME cryptographic signature
___
Merc
> On 3 Apr 2022, at 08.39, Uwe Brauer wrote:
> That's correct; I need to figure out how to handle detached tags
> before merging that branch. I added a test that shows the behaviour,
> but I haven't come up with any good solution yet, sadly.
Hm, I am not sure what you mean by this.
n the topic branch «branches-and-stuff»?
But I also note that in the latest changesets you drop support for 5.2,
and python 3.6, so if you merge, then named branch would only work if
those requirements are met
Uwe Brauer
smime.p7s
Description: S/
>>> "UB" == Uwe Brauer writes:
> Hi
> I run
> hg log -r "removes('**')" --template "{rev}:\n{file_dels % '{file}\n'}\n"
That command does not show the precise change set, I need to run
hg log -r "removes('**')" --templ
ex
So I try to run
hg revert -r 2072 (or any version before)
Annu-Trans/part8+9_ecrigidas/p8D-ecrigidas.tex
hg revert -r 2072 Annu-Trans/part8+9_ecrigidas/p8D-ecrigidas.tex
But I always obtain
Annu-Trans/part8+9_ecrigidas/p8D-ecrigidas.tex: no such file in rev 4cc7a679031f
What do I m
> Failed. Since I move files a lot into subdirectories and sometimes
> rename them, I would be interested in such a feature. Maybe some emacs
> user, Arne?, can say something?
To answer my own question (from the emacs devel list)
> Maybe that could be fixed for the vc-annotate case because the
>>> "AB" == Arne Babenhauserheide writes:
> Uwe Brauer writes:
>> Hi
>>
>> I just learned on the auctex devel list (which uses git) that git blame
>> has -C option for taking renaming into account.
>>
>> It seems that mercurial has a
Hi
I just learned on the auctex devel list (which uses git) that git blame
has -C option for taking renaming into account.
It seems that mercurial has a similar feature, which is enabled per
default.
Am I right?
Regards
Uwe Brauer
--
I strongly condemn Putin's war of aggression against
> On 3/2/22 17:46, Uwe Brauer wrote:
> 6.1 still has 2.7 support, 6.2 will drop it.
It seems that I successfully compiled it with 3.5 (I will later check
whether it runs smoothly with my hg-git and evolve versions)
##
I strongly condem Putin's war of agression against the Ukraine.
I s
>>> "PD" == Pierre-Yves David writes:
> On 3/2/22 16:42, Uwe Brauer wrote:
>>> On 2/24/22 22:10, Uwe Brauer wrote:
>>
>>> It is safe to use. For extra safety I recommand that you upgrade your
>>> repository to use the `share-safe` format t
> On 2/24/22 22:10, Uwe Brauer wrote:
> It is safe to use. For extra safety I recommand that you upgrade your
> repository to use the `share-safe` format that enforce consistency
> between the main repository and share.
> Just upgrade to 6.1 and run `hg debugupgraderepo --ru
> Uwe,
> On Monday, 2022-02-28 08:15:31 +0100, you wrote:
> I haven't used "hg convert" myself since quite some time, but I found an
> old "filemap" file on one of my laptops, which does NOT contain quotes,
> and which has worked then (it dates from early 2014). And "hg help -v
> convert"
> Uwe,
> On Saturday, 2022-02-26 20:34:31 +0100, Uwe Brauer wrote:
> It's not strange at all.
> According to "hg help -v convert" the "include" directive in the filemap
> file neither understands regular expressions nor Shell meta characters.
> An
>>> "UB" == Uwe Brauer writes:
> Hi
> I would like to extract a subdirectory from my main repository. That
> subdirectory contains another subdirectory, that contains images, jpg
> and png
> So https://heavymetaldev.com/hg-repo-conversion
> I tried
/teil3/master-iq.tex
Did not work. What do I miss?
Thanks and regards
Uwe Brauer
___
Mercurial mailing list
Mercurial@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial
>>> "AB" == Arne Babenhauserheide writes:
> Uwe Brauer writes:
>> I see, I would have thought you used hg-git at work (now that is
>> supports named branches)
> I would like to, but we have a one million line codebase, so hg-git has
> t
> Uwe Brauer writes:
> I used to use it, but since Mercurial’s local clones are much more
> convenient than git’s (and use hardlinks, so they take little extra
> space), I usually skip it nowadays.
> At work I stopped with git worktrees again, because they had too many
>
>>> "AB" == Arne Babenhauserheide writes:
> Uwe Brauer writes:
>> I don't use git (only hg-git) but that git-worktree sounds very convenient.
>> Any change to get something implemented like this in mercurial?
> Git worktree is the more inconvenient equiva
Hi
I don't use git (only hg-git) but that git-worktree sounds very convenient. Any
change to get something implemented like this in mercurial?
Uwe Brauer
___
Mercurial mailing list
Mercurial@mercurial-scm.org
https://www.mercurial-scm.org/mailman
>>> "BB" == Brendan Barnwell writes:
> On 2022-02-21 11:51, Uwe Brauer wrote:
>> What the hell.
>>
>> 1. So I clone the repository and indeed
>> on the branch 2020-21 in local repository, there are changesets
>> that are not on remote, s
>>> "UB" == Uwe Brauer writes:
> Hi
> I wanted to strip all changesets of a new branch in draft mode.
> The part of the graph looks like
> ○ changeset: 2477:7a28356c5f3e
> │ Branch: 2021-22
> │ Author: Uwe Brauer
> │ Date:Fr
Hi
I wanted to strip all changesets of a new branch in draft mode.
The part of the graph looks like
○ changeset: 2477:7a28356c5f3e
│ Branch: 2021-22
│ Author: Uwe Brauer
│ Date:Fri, 08 Oct 2021 17:18:40 +0200
│ Topic: examen-extra
│ Phase: draft
repository, there are changesets
that are not on remote, so it seems I did not push them, but
created a new branch and added changesets.
So what shall I do now, strip the whole new branch? It is still
in draft mode
Uwe Brauer
Uwe Brauer
smime.p7s
Description: S/MIME cryptographic signature
___
Mercurial mailing list
Mercurial@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial
> The other way I handle it when I have branches that have separate
> files in them is to have multiple copies of the repo, which was one of
> the other options you mentioned.
Right. Either by
1. Share: so you do the work in the main repository and use the
shared one to access
> I use TortoiseHg's Save at Revision which appends @[rev] to the
> filename. Saving foo.txt at revision 123 essentially does this:
> hg cat --decode -o "f...@123.txt" -r 123 foo.txt
Thanks. A long time ago I gave Tortoise a try and found it to
complicated, so I stick to the command line
appropriate-changeset > newfile. And when I finish I run
hg purge.
Any better idea?
Uwe Brauer
___
Mercurial mailing list
Mercurial@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial
>>> "DVPC" == Dan Villiom Podlaski Christiansen writes:
Hi Dan,
> Hi,
> In addition to the stable release, I've also just pushed a new beta
> release of hg-git to PyPI and Heptapod:
> https://pypi.org/project/hg-git/1.0.0b1/
> https://foss.heptapod.net/mercurial/hg-git/-/tags/1.0.0b1/
>
> Hi,
> Uwe Brauer writes:
> …
> …
> This looks like your .hgsubstate file history was corrupted.
> I didn’t have that problem yet. As first step I’d disable evolve and
> remove the subrepo, both from .hgsub and .hgsubstate. Then commit.
> If you only have one subre
>>> "AB" == Arne Babenhauserheide writes:
> Hi,
> Uwe Brauer writes:
>> hg evolve --abort
>> warning: new changesets detected on destination branch
> …
>> abort: unable to abort interrupted evolve, use 'hg evolve --stop' to stop
>> evolve
with 2278 changes to 2129 files
checking subrepo links
.hgsubstate is corrupt in revision 0769a7baf76f
.hgsubstate is corrupt in revision 3c1b9ef0f25b
Anybody has an idea how to repair that?
Regards
Uwe Brauer
___
Mercurial mailing list
Mercurial
use rollback.
Oh that is an alias for uncommit -a
that command should be ok?
The reason I am using it the following: sometimes I obtain changeset
after a commit of the form
changeset: 117:efa0d2282e73
│╲ Branch: default://application
│ │ tag: tip
│ │ Author: Uw
r 114
hg log -G
hg up tip
When I fired up the last command I obtained the nested error message
Now one part of the graph looks like
│ │ ∗ changeset: 58:9d110314b17f
│ │ │ topic: verhinderung
│ │ │ user:Uwe Brauer
│ │ │ date:Fri Jan 29 18:47:59 2021 +0100
│ │ │
anks basically a lot of changesets are orphans.
First
hg log -G -T default
Gives I will delete some orphan changesets.
* changeset: 113:0769a7baf76f
│ tag: tip
│ parent: 110:861c40e8dad2
│ user:Uwe Brauer
│ date:Sun Oct 10 09:57:07 2021 +0200
│ instability:
* changeset: 113:0769a7baf76f
│ Branch: default
│ tag: tip
│ Author: Uwe Brauer
│ Date:Sun, 10 Oct 2021 09:57:07 +0200
│ Topic: verhinderung
│ Phase: draft
│ Summary: Another try to add Neu-Einstufung/DocX-Neu/
│
∗ changeset: 110:861c40e8dad2
│ Branch
> > "FM" == Faheem Mithawrites:
Hi Faheem
> Hi Uwe,
> For Mercurial you can use the distribution packages. At least Debian now
> has 6.0, which should work if you rebuild it on Ubuntu. Ubuntu may have
> recent packages as well. You should check.
> And Evolve has Debian
Hi
I tried to compile and install evolve from
https://www.mercurial-scm.org/repo/evolve/
Via
pip3 install --user .
And obtained
DEPRECATION: Python 3.5 reached the end of its life on September 13th, 2020.
Please upgrade your Python as Python 3.5 is no longer maintained. pip 21.0 will
---
WARNING: Discarding
https://files.pythonhosted.org/packages/31/df/99233a034927ae24d4c9f47e9ff2a39a4386aeda67e5ae7996fc4f8f2364/hg-evolve-6.0.0.tar.gz#sha256=ec3d95e35392642dc1eabecb20e7d439772055968aedb2e433946e393165eb36
(from https://pypi.org/simple/hg-evolv
.
Any ideas?
Regards
Uwe Brauer
___
Mercurial mailing list
Mercurial@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial
It not really clear to me. I have to add that I do use named branches
and topics but no bookmarks, since they confuse me.
Any information would be welcome.
Regards
Uwe Brauer
___
Mercurial mailing list
Mercurial@mercurial-scm.org
https://www.mercurial-scm.org
> I think you're running into a common issue that bookmarks are not really
> like branches in git. Check out topics and see if those fit your
> workflow, otherwise, for me at least, being aware of limitations of
> bookmarks and making use of phases, and the convention of a main
> bookmark,
> Uwe Brauer wrote:
> Thank you Uwe for the hint, I'm reading
> https://www.mercurial-scm.org/doc/evolution/tutorials/topic-tutorial.html
> and maybe that's what will make me happy.
> In a few words, how are topics better than bookmarks, what's more
> intuitive in the former
a try (you
need the evolve extension for this).
You can even have a non-fast-forward merge of topics, you need
[experimental]
topic.linear-merge = allow-from-bare-branch
Regards
Uwe Brauer
smime.p7s
Description: S/MIME cryptographic signature
___
Mercurial mailing list
Mercurial@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial
help would be appreciated
Regards
Uwe Brauer
*** failed to import extension evolve: No module named 'evolve'
*** failed to import extension b from /home/oub/ALLES/src/b/src/b.py: invalid
syntax (b.py, line 190)
*** failed to import extension hggit from
/home/oub/ALLES/src/hg-git-heptapod/hggit
Hi
I have a bizzarre problem.
Graph of repository 1.
○ changeset: 788:e4696b6765e3
│╲ Branch: default
│ │ Author: Uwe Brauer
│ │ Date:Mon, 08 Nov 2021 19:10:59 +0100
│ │ Phase: draft
│ │ Summary: Merge arXiv--> default (new abstract)
│ │
│ │ ○ change
>>> "UB" == Uwe Brauer writes:
> Hi
> https://www.trojansource.codes/trojan-source.pdf
> I skimmed the article, the authors claim that python is effect.
> Any thoughts?
Maybe that https://research.swtch.com/trojan
smime.p7s
Description:
Hi
https://www.trojansource.codes/trojan-source.pdf
I skimmed the article, the authors claim that python is effect.
Any thoughts?
Regards
Uwe Brauer
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial
>>> "DLB" == Dennis Lee Bieber writes:
> On Sat, 23 Oct 2021 18:58:06 +0200, Uwe Brauer declaimed
> the following:
>>
>> Maybe I don't know enough of the sophisticated syntax of «hg grep» but I
>> have always found hg grep not very useful.
>>
file. However hg grep was enable to find that
string in that particular revision.
Is this a well known limitation of hg grep or do I miss here something
fundamental?
Regards
Uwe Brauer
___
Mercurial mailing list
Mercurial@mercurial-scm.org
https
>>> "RW" == Rainer Woitok writes:
> Uwe,
> On Monday, 2021-10-11 17:15:31 +0200, you wrote:
>> ...
>> hg.allowed = True
>> git.allowed = True
>>
>> So what is my mistake?
> Shouldn't that be
> hg:allowed = True
> git:allowed = True
> instead (colon rather than period)?
Oops when reading
config.subrepos' for details)
However my .hgrc file has
[subrepos]
subrepos.allowed = True
hg.allowed = True
git.allowed = True
So what is my mistake?
Uwe Brauer
smime.p7s
Description: S/MIME cryptographic signature
___
Mercurial mailing list
Mercurial@mercurial
m not sure whether this workflow is recommendable.
Any suggestions?
Regards
Uwe Brauer
___
Mercurial mailing list
Mercurial@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial
>>> "TH" == Tom Hindle writes:
> Yes you can use amend to change the merge message of a non public merge
> commit.
> hg commit --message="hi" --amend
thanks
It even works with -e (editor)
Well actually (evolve)
hg amend -e
smime.p7s
Description: S/MIME cryptographic signature
Hi
I screwed up a message in a merge (it is still not pushed).
Now hg histedit does not work, actually it refuses.
Could I use the amend command (evolve enabled)?
Regards
Uwe Brauer
___
Mercurial mailing list
Mercurial@mercurial-scm.org
https
>>> "DLB" == Dennis Lee Bieber writes:
> On Wed, 22 Sep 2021 13:11:13 +0200, Jaume Cañas
> declaimed the following:
>> Hi,
>>
>> I'm using a w10 PC:
>>
>> and for installing the mercurial,
>>
>> I choose the inno setup installer - x64 Windows.
>>
> For Windows -- the easiest is
>>> "DVPC" == Dan Villiom Podlaski Christiansen writes:
> On 20 Sep 2021, at 14.24, Uwe Brauer wrote:
> On my Mac,[1] updating from `null` to `master` takes about 2 seconds
> with that repository.[2] Please note that stuff like updating depends
> on how m
cached
1 largefiles failed to download
abort: all largefiles must be present locally
Any idea how to solve that?
Uwe Brauer
___
Mercurial mailing list
Mercurial@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial
>>> "DVPC" == Dan Villiom Podlaski Christiansen writes:
Hi Dan
> On 20 Sep 2021, at 14.24, Uwe Brauer wrote:
>>> Which version of hg-git, Mercurial and Python are you running?
>>
>> Well aehm (since I need the artemis extension which requires pyt
>>> "DVPC" == Dan Villiom Podlaski Christiansen writes: > >
> Den 19 Sep 2021 kl. 08.38 skrev Uwe Brauer :
>> Hi
>>
>> I am starting to notice a problem when I access large git repositories.
> [snip]
>> 3. GNU emacs however (that was co
>>> "UB" == Uwe Brauer writes:
>>> "PD" == Pierre-Yves David writes:
>> yes
>> On 6/29/21 12:02 PM, Uwe Brauer wrote:
>>>>>> "PD" == Pierre-Yves David writes:
>>> > can you run the same comand
>>> "PD" == Pierre-Yves David writes:
> yes
> On 6/29/21 12:02 PM, Uwe Brauer wrote:
>>>>> "PD" == Pierre-Yves David writes:
>> > can you run the same comand using `//` ?
>>
>> You mean
>>
>> hg strip -
:
not only
a. hg branches but also
b. hg ci etc
I have also the evolve extension enabled, I disabled it, but it did not make
any difference.
Does or did anybody notice something similar?
regards
Uwe Brauer
smime.p7s
Description: S/MIME cryptographic signature
62efcd62cb99c6d805f35b9e1f94bdd5393418e4)
Whoever tortoisehg displays this operation nicely by a dashed lines (see
the attached screenshot).
Regards
Uwe Brauer
___
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org
> Yes. Changes merged into a secret branch will also be secret while the
> public\draft parent branch will stay as is. It's only when merging
> from a secret branch out to a non-secret branch that a secret branch
> can't be secret anymore.
> Oh, and you'll want to make sure your multiple local
>>> "AD" == Alessandro Dentella writes:
> On Thu, Sep 16, 2021 at 10:24:19AM +0200, Uwe Brauer wrote:
>> Hi
>>
>> Sometimes hg status tells me that 5 files are modified but the modification
>> in one or two file are unwanted.
>>
>>
Hi
Sometimes hg status tells me that 5 files are modified but the modification in
one or two file are unwanted.
So what I do is,
- hg shelve -i
- hg up -C
- hg unshelve
Is there any quicker way of doing this?
Thanks and regards
Uwe Brauer
smime.p7s
Description: S/MIME
> Don't commit the bug fix to your secret branch, commit it to default then
> merge it forward into your secret branch.
>a. Shelve the other changes leaving fix in working directory.
>b. Update to tip of default branch so fix can merge into default code.
> * In TortoiseHg I have
/.abbrev_defs
16 hunks, 16 lines changed
examine changes to '.abbrev_defs'?
(enter ? for help) [Ynesfdaq?]
I am confused about the diff message, since in the first case also no
diff is displayed, but I presume I could if I want. In any case:
Anything I could do?
Regards
Uwe Brauer
smime.p7s
>>> "AB" == Arne Babenhauserheide writes:
> It is a great match for secret changesets: Just add `hg phase -s .`
> after hg branch and you have a branch that you cannot push accidentally.
> Now you keep working there and before pushing you can adjust the name as
> needed.
I found out a small
>>> "AB" == Arne Babenhauserheide writes:
> Uwe Brauer writes:
> It is a great match for secret changesets: Just add `hg phase -s .`
> after hg branch and you have a branch that you cannot push accidentally.
> Now you keep working there and before pushing you
>>> "AB" == Arne Babenhauserheide writes:
> I either use the secret phase for such commits, and then update back to
> the previous commit. If I expect the work to be larger, I just create a
> new branch.
In the past I create a new named branch and pushed. However sometimes my
collaborator did
I ask
What is the best strategy in such circumstances?
Regards
Uwe Brauer
___
Mercurial mailing list
Mercurial@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial
am not sure whether it is worth the effort.
In any case I was wondering whether the graph could express somehow a
graft or backout operation. It does display, nicely, a merge operation.
Regards
Uwe Brauer
___
Mercurial mailing list
Mercurial
am not sure whether it is worth the effort.
In any case I was wondering whether the graph could express somehow a
graft or backout operation. It does display, nicely, a merge operation.
Regards
Uwe Brauer
smime.p7s
Description: S/MIME cryptographic signature
am not sure whether it is worth the effort.
In any case I was wondering whether the graph could express somehow a
graft or backout operation. It does display, nicely, a merge operation.
Regards
Uwe Brauer
___
Mercurial mailing list
Mercurial
> (oops, replied to this a bit too fast)
> On 8/31/21 5:32 PM, Pierre-Yves David wrote:
> You can, however, produce local backup using `hg bundle --all --hidden
> --config experimental.|evolution.bundle-obsmarker=yes`
Then in principle rsync should work as well, however I had repository
recisely?
Is very interesting
And that as well, although I think worddiff is a bit expensive
[experimental]
graphshorten = true
worddiff = true
Regards
Uwe Brauer
smime.p7s
Description: S/MIME cryptographic signature
___
Mercurial mailing list
Me
101 - 200 of 764 matches
Mail list logo