Re: how to find all merges into the default branch

2024-02-13 Thread Uwe Brauer via Mercurial
>>> "UBvM" == Uwe Brauer via Mercurial >>> writes: >>> "BMJ" == Becker, Mischa J writes: >> I have no familiarity with hg-git repos but, just looking at your >> filter, you aren't including merges, just heads. Would the following >

Re: how to find all merges into the default branch

2024-02-12 Thread Uwe Brauer via Mercurial
()-parents(merge())-closed()-tag(tip)" It works like a charm, thanks a lot > Mischa Becker >> -Original Message----- >> From: Mercurial On Behalf Of >> Uwe Brauer via Mercurial >> Sent: Saturday, February 10, 2024 8:20 AM >> To: Mercurial List >> Subjec

how to find all merges into the default branch

2024-02-10 Thread Uwe Brauer via Mercurial
parent: 6686:1b8ed9c58e49 parent: 6695:80948ef561c8 user:Tassilo Horn date:Sun Jan 31 08:17:25 2016 +0100 summary: Merge branch 'master' into simplify-TeX-parse-error But not the merge I just described. Any idea what to do? Thanks Uwe Br

commands to find out whether a repository shares with another one and vice versa

2024-02-10 Thread Uwe Brauer via Mercurial
Any recommendations? Regards Uwe Brauer -- I strongly condemn Hamas heinous despicable pogroms/atrocities on Israel I strongly condemn Putin's war of aggression against Ukraine. I support to deliver weapons to Ukraine's military. I support the EU and NATO membership of Ukraine. smime.p7s

problems sharing a repo (because of long deleted subrepos)

2024-01-17 Thread Uwe Brauer via Mercurial
deleted a long time ago. So I removed these lines committed and hoped of the best. Alas it did not help. So is this a BUG, or how can I solve this problem? Thanks Uwe Brauer -- I strongly condemn Hamas heinous despicable pogroms/atrocities on Israel I strongly condemn Putin's war of aggression

Re: the evil subrepo extension and share

2023-12-22 Thread Uwe Brauer
17:15, Uwe Brauer wrote: -- I strongly condemn Hamas heinous despicable pogroms/atrocities on Israel I strongly condemn Putin's war of aggression against Ukraine. I support to deliver weapons to Ukraine's military. I support the EU and NATO membership of Ukraine. smime.p7s Description:

the evil subrepo extension and share

2023-12-20 Thread Uwe Brauer
Hi Unfortunately (also I have been warned) I used in a repository, lets call it HG-Lecture a subrepo, lets call it matlab-2021 When I tried to share the repository HG-Lecture I ran into difficulties with the subrep (some bizarre python error I don't) understand. So I had the «brilliant» idea

Re: [more experimients]

2023-10-26 Thread Uwe Brauer
> From: Uwe Brauer > Sent: Wednesday, October 25, 2023 12:16 AM > Subject: [more experimients] (was: single-file-merge?) > You're right. As long as you remember to repeat your 'Single file [Snip]... > The only other thing I'd point out is your test example doesn't give > y

[more experimients] (was: single-file-merge?)

2023-10-25 Thread Uwe Brauer
> I'm pretty sure all those file changes you threw away in the merge > from meta to default will get stripped from meta if you later merge > default back into meta. I tried the following hg init echo "First" > test.org hg add test.org hg commit -m "0: First" echo "Second" >> test.org hg

Re: single-file-merge?

2023-10-24 Thread Uwe Brauer
> When I need changes made in another branch pulled into default without > everything else in the branch I use hg graft. Graft merges over just > the specific commit(s) you've selected, not the whole branch. As long > as the changes you want to pull into default are in their own commits, >

Re: single-file-merge?

2023-10-24 Thread Uwe Brauer
> I'm pretty sure all those file changes you threw away in the merge > from meta to default will get stripped from meta if you later merge > default back into meta. Hm, good point I have to check > When I need changes made in another branch pulled into default without > everything else in the

Re: single-file-merge?

2023-10-24 Thread Uwe Brauer
>>> "MK" == Marcin Kasperski writes: >> hg up default >> hg merge meta --tool internal:other >> hg revert --all default >> hg revert common-file.tex meta >> hg commit -m "A single-file merge with common-file.tex" > IIRC revert fails to delete „new” files, at least this was the problem I >

single-file-merge?

2023-10-24 Thread Uwe Brauer
--all default hg revert common-file.tex meta hg commit -m "A single-file merge with common-file.tex" Any comments? Uwe Brauer -- Warning: Content may be disturbing to some audiences I strongly condemn Hamas bestialic terroristic attack on Israel, especially the despicable pogroms.

Re: committing some lines

2023-10-02 Thread Uwe Brauer
>>> "SF" == Steve Fink writes: > On Sun, Oct 1, 2023 at 11:55 PM Hartmut Goebel > wrote: >> >> I will watch it, because I've heard such good things about magit, but to > be clear: I don't have much interest in using git any more than I have to. > I started with git and used it for some time

[Emacs support for commiting hunks] (was: committing some lines)

2023-10-01 Thread Uwe Brauer
so do this the other way around) and then run vc-next-action and viola. Regards Uwe Brauer -- Warning: Content may be disturbing to some audiences I strongly condemn Putin's war of aggression against the Ukraine. I support to deliver weapons to Ukraine's military. I support the NATO membership o

how to undo a prune command

2023-09-05 Thread Uwe Brauer
are hidden. If I had stripped theses changesets (of the topic) I could just pull them from the strip backup directory. But in my case? Thanks in advance Uwe Brauer ___ Mercurial mailing list Mercurial@lists.mercurial-scm.org https://lists.mercurial-scm.o

Re: Understanding the relationship of mercurial and it's extensions

2023-08-30 Thread Uwe Brauer
>>> "AB" == Arne Babenhauserheide writes: > Ernie Rael writes: >>> If that hg-git extension you mention is so good, why haven't the >>> Mercurial maintainers adopted it ? >> >> I'm not even sure what he meant by this question (I suggested that >> maybe some of them do). I guess his concern is

Re: Understanding the relationship of mercurial and it's extensions

2023-08-30 Thread Uwe Brauer
>>> "AB" == Arne Babenhauserheide writes: > Tony Mechelynck writes: >> I'm the one who asked the original question. Ernie seemed (to me) >> waxing dithyrambic about some third-party "hg-git" extension, so I > hg-git is pretty good. I’ve been using it for years for large and small >

[Solved] (was: repository with 2 heads: how to rebase/copy/graft a named branch as an topological branch with topics (and a third head))

2023-07-26 Thread Uwe Brauer
>>> "UB" == Uwe Brauer writes: > Hi > Consider please the following example Sorry my bad hg init echo "First" > test.org hg add test.org hg commit -m "0: First" echo "Second" >> test.org hg commit -m "1: Second" ec

repository with 2 heads: how to rebase/copy/graft a named branch as an topological branch with topics (and a third head)

2023-07-26 Thread Uwe Brauer
; hg up default~1 hg branch feature echo "Forth" >> test.org hg commit -m "3: BUG Fourth" echo "Fifth" >> test.org hg commit -m "4: Fifth" hg up default echo "Six" >> test.org hg commit -m "5: Six" hg up default That

Re: notify configuration don't inlcude diffs from binaries

2023-07-24 Thread Uwe Brauer
>>> "UB" == Uwe Brauer writes: > Hi > I am using notify since quite a while, however in one repository I > have included an odt file, but then the diff is rather unreadable. > https://wiki.mercurial-scm.org/NotifyExtension > only specifies to restrict the l

notify configuration don't inlcude diffs from binaries

2023-07-24 Thread Uwe Brauer
notify not to include diffs of binaries? Regards Uwe Brauer -- Warning: Content may be disturbing to some audiences I strongly condemn Putin's war of aggression against the Ukraine. I support to deliver weapons to Ukraine's military. I support the NATO membership of the Ukraine. I support the EU

Re: uncommit -a == strip --keep -r .

2023-07-24 Thread Uwe Brauer
>>> "PD" == Pierre-Yves David writes: > uncommit --all does nor strip (nor prune) the current working > directory parents, it only empty it. Ok and if I prune and re-commit again I would get an hidden obsolete change set, which I would not get with strip -- Warning: Content may be disturbing

uncommit -a == strip --keep -r .

2023-07-24 Thread Uwe Brauer
Hi Suppose I am on tip What is the difference between uncommit -a strip --keep -r . Uwe Brauer -- Warning: Content may be disturbing to some audiences I strongly condemn Putin's war of aggression against the Ukraine. I support to deliver weapons to Ukraine's military. I support

Re: hg equivalent to git checkout master~1 or master~2 etc

2023-07-23 Thread Uwe Brauer
>>> "SF" == Steve Fink writes: > On 7/22/23 1:31 PM, Uwe Brauer wrote: >> Hi >> >> Just out of curiosity: is there any hg equivalent to git checkout >> master~1 and friends. > `hg checkout master~1` and friends? Ha, thanks I should have simp

[SOLVED?] (was: hg equivalent to git checkout master~1 or master~2 etc)

2023-07-23 Thread Uwe Brauer
>>> "UB" == Uwe Brauer writes: > Hi > Just out of curiosity: is there any hg equivalent to git checkout > master~1 and friends. hg up hg up "revset(default~1)" Seems to do what I wanted. -- Warning: Content may be disturbing to some au

hg equivalent to git checkout master~1 or master~2 etc

2023-07-22 Thread Uwe Brauer
Hi Just out of curiosity: is there any hg equivalent to git checkout master~1 and friends. I can't find nothing in the docs or google Regards Uwe Brauer PS I don't use bookmarks -- Warning: Content may be disturbing to some audiences I strongly condemn Putin's war of aggression against

Re: when is a merge a conflict, two named branches with or without heads

2023-07-21 Thread Uwe Brauer
> 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... >

Re: when is a merge a conflict, two named branches with or without heads

2023-07-21 Thread Uwe Brauer
>>> "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

when is a merge a conflict, two named branches with or without heads

2023-07-21 Thread Uwe Brauer
es* in the first example that conflict. (I presume the reason is: example 1 has no topological head) Regards Uwe Brauer -- Warning: Content may be disturbing to some audiences I strongly condemn Putin's war of aggression against the Ukraine. I support to deliver weapons to Ukraine's mil

Re: how to solve a conflicting editing for someone (using backout?), but cannot merge since there is only one head

2023-06-23 Thread Uwe Brauer
@ changeset: 10:6535da53c78e │╲ tag: tip │ │ Branch:default │ │ Author:Uwe Brauer │ │ Date: Fri, 23 Jun 2023 19:54:08 +0200 │ │ Phase: draft │ │ Summary: Merged the conflicting changesets, ignored the backout │ │ │ │ ○ changeset:

Re: how to solve a conflicting editing for someone (using backout?), but cannot merge since there is only one head

2023-06-23 Thread Uwe Brauer
@ changeset: 10:6535da53c78e │╲ tag: tip │ │ Branch:default │ │ Author:Uwe Brauer │ │ Date: Fri, 23 Jun 2023 19:54:08 +0200 │ │ Phase: draft │ │ Summary: Merged the conflicting changesets, ignored the backout │ │ │ │ ○ changeset:

Re: how to solve a conflicting editing for someone (using backout?), but cannot merge since there is only one head

2023-06-23 Thread Uwe Brauer
revert, and then check the .orig files for conflicts and resolve them? > On 4/6/23 17:38, Uwe Brauer wrote: >> Hi >> >> Here is the situation. Both users have cloned from server >> User1 adds a change set (and a conflict) and his graph looks like >>

Re: hg up and phases, surprises

2023-05-27 Thread Uwe Brauer
>>> "PD" == Pierre-Yves David writes: > On 5/27/23 08:43, Uwe Brauer wrote: >>> On 5/25/23 15:49, Uwe Brauer wrote: >> >>> Your changeset are not considered as part of the "default" branch >>> while there topic is active. The &quo

Re: hg up and phases, surprises

2023-05-27 Thread Uwe Brauer
> On 5/25/23 15:49, Uwe Brauer wrote: > Your changeset are not considered as part of the "default" branch > while there topic is active. The "default" keyword resolve to the head > of the un-topiced changeset on default. This was an important update > in

Re: hg up and phases, surprises

2023-05-26 Thread Uwe Brauer
>>> "GR" == Georges Racinet writes: > Hi there, a precision > On 26/05/2023 07:30, Dr. Arne Babenhauserheide wrote: >>> Yes of course a local one >>> Is the repository set as publishing? >>> >>> Yes >>> >>> [phases] >>> publish = True >>> >>> >>> But I changed it to >>> >>> [phases] >>>

Re: hg up and phases, surprises

2023-05-25 Thread Uwe Brauer
>>> "AB" == Arne Babenhauserheide writes: > Uwe Brauer writes: >> hg up default >> >> It does not jump to tip but to the last public change set on the default >> branch, why? >> When I run >> >> hg up british >> &g

hg up and phases, surprises

2023-05-25 Thread Uwe Brauer
Hi Look at the following graph ○ changeset: 569:33171fb597a8 │ tag: tip │ Branch:default │ Author:Uwe Brauer │ Date: Thu, 25 May 2023 15:42:36 +0200 │ Topic: corrections │ Phase: draft │ Summary: Ej2B change to singular

Re: how to find out the *base* of bookmark, (where it started)

2023-04-28 Thread Uwe Brauer
> On 4/28/23 14:57, Uwe Brauer wrote: > I am talking about the `roots` revset : >     hg log --rev "root(only('master'))" Ok thanks, I cloned with hg-git, https://sourceforge.net/p/matlab-emacs/src/ hg bookmarks Returns copyright 679:fea497d36b

Re: how to find out the *base* of bookmark, (where it started)

2023-04-28 Thread Uwe Brauer
>>> "PD" == Pierre-Yves David writes: > On 4/28/23 14:51, Uwe Brauer wrote: >>>>> "UB" == Uwe Brauer writes: >>> If all your bookmark create a unique and independant topological >>> branch you can use `roots(only("bo

Re: how to find out the *base* of bookmark, (where it started)

2023-04-28 Thread Uwe Brauer
>>> "UB" == Uwe Brauer writes: >> If all your bookmark create a unique and independant topological >> branch you can use `roots(only("bookmark-name"))` to find the root of >> that unique topological branch. Meanwhile I tried out hg root(on

Re: how to find out the *base* of bookmark, (where it started)

2023-04-28 Thread Uwe Brauer
> On 4/18/23 22:10, Uwe Brauer wrote: > Min is just going to give you the lowest revision number matching a > revset. This is not what you want (and in this case, the revset only > match one revision). > Bookmark does not record this information, so you don't have a > defi

how to find out the *base* of bookmark, (where it started)

2023-04-18 Thread Uwe Brauer
Thanks Uwe Brauer -- Warning: Content may be disturbing to some audiences 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. https

remotenames does not really display remote named branches

2023-04-14 Thread Uwe Brauer
, or a missing configuration from my side, but hg help remotenames does give any hints. Regards Uwe Brauer -- Warning: Content may be disturbing to some audiences I strongly condemn Putin's war of aggression against the Ukraine. I support to deliver weapons to Ukraine's military. I support the ban

how to solve a conflicting editing for someone (using backout?), but cannot merge since there is only one head

2023-04-06 Thread Uwe Brauer
Hi Here is the situation. Both users have cloned from server User1 adds a change set (and a conflict) and his graph looks like ◍ changeset: 6:8d6ce4461712 │ Branch:default │Author:Uwe Brauer │Date: Thu, 06 Apr 2023 17:17:37 +0200 │Phase

could any other named branch be the default branch or could hg-git import git branches to other named hg branches?

2023-02-28 Thread Uwe Brauer
. Mercurial: is there a way to tell mercurial the default named branch should be called say main? 2. Hg-git: is it possible to import git branches to other mercurial named branches, say main or master? Thanks and regards Uwe Brauer -- Warning: Content may be disturbing

Re: [how can I pull from hg serve?]

2023-02-27 Thread Uwe Brauer
>>> "AB" == Arne Babenhauserheide writes: > Uwe Brauer writes: >> Ok, when I am in the university that is not a problem, the laptop gets >> a static IP, however at home I obtain a dynamic one, not sure whether >> that might cause problems. > The so

Re: [how can I pull from hg serve?]

2023-02-27 Thread Uwe Brauer
>>> "FK" == František Kučera writes: > Dne 26. 02. 23 v 11:13 Uwe Brauer napsal(a): >>> 2. How can I change the setting to have the my IP number instead the >>> name of my machine? >> That one is still mysterious to me. > When I run hg serve,

Re: [how can I pull from hg serve?]

2023-02-26 Thread Uwe Brauer
> There is nothing to change. If you use the IP address of your machine > to pull it will just work. That is after all what the machine name > maps to anyway. It’s all an IP address in the end. Just to get this straight. I tell someone, say in Australia my IP I run hg serve then this someone

Re: [how can I pull from hg serve?]

2023-02-26 Thread Uwe Brauer
>>> "UB" == Uwe Brauer writes: > I tried out a very simple thing: > in a repository I run hg serve > well I can open with a browser > to http://name of my_machine:8000 > The documentation claims this is for pulling, > «Mercurial has a built-in ligh

[how can I pull from hg serve?] (was: setting up a very simple mercurial server, like in git?)

2023-02-26 Thread Uwe Brauer
? Thanks Uwe Brauer smime.p7s Description: S/MIME cryptographic signature ___ Mercurial mailing list Mercurial@lists.mercurial-scm.org https://lists.mercurial-scm.org/mailman/listinfo/mercurial

Re: setting up a very simple mercurial server, like in git?

2023-02-25 Thread Uwe Brauer
>>> "MF" == Michael Forbes writes: > A) The simplest option is to just have people ssh into your machine. > If they setup an alias in ~/.ssh/config, then it is easy: > #~/.ssh/config on your collaborators computers Host uwe User account name> HostName So do you mean I should set up additional

setting up a very simple mercurial server, like in git?

2023-02-25 Thread Uwe Brauer
https and set up a password, but could live with ssh). Thanks and regards Uwe Brauer -- Warning: Content may be disturbing to some audiences 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

Re: Testing an RC of evolve 11.0.0 and topic 1.0.0

2023-02-06 Thread Uwe Brauer
>>> "AS" == Anton Shestakov writes: > 04.02.2023 22:56, Uwe Brauer пишет: >> Maybe we have a misunderstanding here. >> I don't mean the result >> hg branches >> I meant that sometimes >> hg log (with my template, I am not going to post here wou

Re: Testing an RC of evolve 11.0.0 and topic 1.0.0

2023-02-04 Thread Uwe Brauer
>>> "AS" == Anton Shestakov writes: > 04.02.2023 14:56, Uwe Brauer пишет: >> >>> 03.02.2023 00:34, Uwe Brauer пишет: >> >>> By "this" do you mean "branch:topic" or "branch//topic"? >> I meant "branch

Re: Testing an RC of evolve 11.0.0 and topic 1.0.0

2023-02-04 Thread Uwe Brauer
> 03.02.2023 00:34, Uwe Brauer пишет: > By "this" do you mean "branch:topic" or "branch//topic"? I meant "branch//topic" So can I switch the new namespace feature of, if I don't like it? > What version of evolve do you have? I think it

Re: some hgrc settings only for some repositories in a certain directory.

2023-02-03 Thread Uwe Brauer
>>> "CO" == Craig Ozancin writes: > Could you use %include to include a separate file with your content in it? Do you mean in each local hgrc file, I have a line like %include ../../hgrc smime.p7s Description: S/MIME cryptographic signature ___

some hgrc settings only for some repositories in a certain directory.

2023-02-02 Thread Uwe Brauer
in https://www.mercurial-scm.org/doc/hgrc.5.html Regards Uwe Brauer -- Warning: Content may be disturbing to some audiences 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

Re: Testing an RC of evolve 11.0.0 and topic 1.0.0

2023-01-31 Thread Uwe Brauer
ff)? BTW what are the minimum requirements for this evolve version you describe. Would be hg 5.2 ok (either compiled with python 3.5 or 2.7)? Regards Uwe Brauer smime.p7s Description: S/MIME cryptographic signature ___ Mercurial-devel mailing li

Re: log template, colors, command line: Linux ok, MacOS no

2023-01-24 Thread Uwe Brauer
>>> "CO" == Craig Ozancin writes: > Let me make a suggestion. Why not use built in color system instead of > hard-coding the color values. Thanks I will have a look into this later. smime.p7s Description: S/MIME cryptographic signature ___

log template, colors, command line: Linux ok, MacOS no

2023-01-18 Thread Uwe Brauer
(Ubuntu) either in tcsh or bash everything works as expected and all colors are displayed. However on MacOS (Catalina) either in tcsh or bash the colors \x1B[48m and \x1B[38m Are not displayed. Any idea? Thanks and regards Uwe Brauer -- Warning: Content may be disturbing to some audien

notify seems not to work when pushing to github

2023-01-15 Thread Uwe Brauer
: {branches} | changeset: {rev}:{node|short} | user: {author} | date: {date|date} | description: {desc}\n | | [reposubs] | * = Uwe Brauer ` And the relevant smtp setting that I am not going to copy here, but I ensure you it is tested when pushing say to helix But when I

Re: Seeking magit-like interface in Emacs

2023-01-11 Thread Uwe Brauer
> Hi Hartmut > Aha, which one, this https://github.com/ncalexan/monky I just tried that out. Well monky-status does something similar to vc-dir, but then I cannot commit easily especially not selected files. So I don't see, still, the benefits of monky. Uwe -- Warning: Content may be

Re: Seeking magit-like interface in Emacs

2023-01-10 Thread Uwe Brauer
>>> "HG" == Hartmut Goebel writes: Hi Hartmut > Hi Uwe, >> So it would be helpful, first to checkout these packages and then report >> what you are missing. > Thanks for your tips. > Good news: meanwhile I learned that there is an enhanced branch/fork > of monky, providing a transient

who is maintaining notify how to reach vadim.gelfer

2022-12-30 Thread Uwe Brauer
. Thanks Uwe Brauer -- Warning: Content may be disturbing to some audiences 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. https

notify, problem with the template Subject {desc} does not show last change set but the first

2022-12-30 Thread Uwe Brauer
changesets, namely ◍ changeset: 14:a753c87caf09 │ tag: tip │ Remote_Branch: helix/default │ Branch:default │ Author:Uwe Brauer │ Date: Fri, 30 Dec 2022 08:30:47 +0100 │ Phase: public │ Summary: template = Subject

how to change the default path, for hg push

2022-12-28 Thread Uwe Brauer
://UweBrauer@helixteamhub.cloud/broad-rain-1388/projects/something But then I need to run hg push helix I could also use the allpath extension And then hg pushall Would be ok, but I wounder whether there is a solution by HG vanilla Regards Uwe Brauer -- Warning: Content may be disturbing

Re: Seeking magit-like interface in Emacs

2022-12-26 Thread Uwe Brauer
hg-histedit allows you to run hg histedit from within emacs. So it would be helpful, first to checkout these packages and then report what you are missing. Regards Uwe Brauer Footnotes: [1] I am sticking to the hg-git plugin with a special patch provided my Manuel Jacob that allows

Re: code table for the colors in the log templates

2022-12-26 Thread Uwe Brauer
>>> "BD" == Bridger Dyson-Smith writes: Hi Bridger > Hi Uwe - > Maybe https://www.shellhacks.com/bash-colors/ is a decent start? Great, thanks, very useful smime.p7s Description: S/MIME cryptographic signature ___ Mercurial mailing list

code table for the colors in the log templates

2022-12-23 Thread Uwe Brauer
Hi Where can I find a table for the color codes in the log templates For example \x1B[42m is green But whats about other colors? -- Warning: Content may be disturbing to some audiences I strongly condemn Putin's war of aggression against the Ukraine. I support to deliver weapons to

[SOLVED] (was: remotenames and hg log -G and templates)

2022-12-23 Thread Uwe Brauer
>>> "UB" == Uwe Brauer writes: > Hi > I am using finally only the remotenames extension well it is remotesnames not remotename {ifeq(remotenames,"","","\x1B[42mRemote_Branch: {remotenames}\n")}

remotenames and hg log -G and templates

2022-12-23 Thread Uwe Brauer
Hi I am using finally only the remotenames extension When I use hg log -G I see changeset: 2695:f61f6ee01aa7 │ branch: 2022-23 │ tag: tip │ remote branch: default/2022-23 │ user:Uwe Brauer │ date:Fri Dec 23 09:23:27 2022 +0100 │ summary: Add

[SOLVED] (was: hg-git and allpath)

2022-12-22 Thread Uwe Brauer
>>> "UB" == Uwe Brauer writes: > Hi > I want to push to three git repositories at once using ssh > So I have > [paths] > github = g...@github.com:ouboub/git-topic-branch.git > gitlab = g...@gitlab.com:kalthad/git-topic-branch.git > bitbucket

hg-git and allpath

2022-12-22 Thread Uwe Brauer
not exist! Which is nonsense I can push to that repository without problems hg pushall -g publish Gives abort: repository g...@bitbucket.org:kalthad/git-topic-branch.git does not exist! I am puzzled, any ideas? Regards Uwe Brauer -- Warning: Content may be disturbing to some audiences I

emacs commit on every save

2022-12-08 Thread Uwe Brauer
Hi I used that functionality a long time ago, when I still used RCS, now inspired by git-auto-commit-mode I came up with the following quite simple solution, maybe some of your might find this useful Regards Uwe Brauer (defvar hg-mycommit "hg ci " "Variable to control

[import/export named branches using evolve and empty git hashes] (was: graft/rebase without changing the hash)

2022-11-28 Thread Uwe Brauer
in using the option mentioned above I run several experiments with git sandboxes and it worked, however I am not sure what happens with more complex git repositories and more users. Any ideas HG-GIT developers? Or somebody else dealing really with git repositories (I mean pulling and pushing, not just

Re: [working workflow for importing git to a named branch]

2022-11-26 Thread Uwe Brauer
>>> "AB" == Arne Babenhauserheide writes: > Uwe Brauer writes: >>> It sounds like what you want is to have the resulting git-hash equal, >>> not to have the Mercurial-hash equal. This could in theory be possible >>> (because the branch name is n

Re: graft/rebase without changing the hash

2022-11-26 Thread Uwe Brauer
>>> "AB" == Arne Babenhauserheide writes: Hi Arne > Hi Uwe, > Uwe Brauer writes: >> [[S/MIME Signed Part:Good signature from >> D472940B79E53E815167CEC95E244FB27DD2E8DB /CN=BRAUER UWE RICHARD OTTO >> - X2064123B/C=ES/SN=BRAUER/GN=UWE RICHARD

graft/rebase without changing the hash

2022-11-25 Thread Uwe Brauer
I am looking for is impossible, right? Regards Uwe Brauer -- Warning: Content may be disturbing to some audiences 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

[git tags] (was: how can I remove a local tag?)

2022-11-18 Thread Uwe Brauer
>>> "PD" == Pierre-Yves David writes: > hg tag --remove --local test That't it! Thanks But now I also tried out a git tag ◍ changeset: 2:5b1ddd921002 │ Branch: default │ tag: test2 │ tag: tip │ Author: Uwe Brauer │ Date:Sun

how can I remove a local tag?

2022-11-18 Thread Uwe Brauer
Hi After adding a local tag hg log -G shows me ◍ changeset: 2:5b1ddd921002 │ Branch: default │ tag: tip │ Author: Uwe Brauer │ Date:Sun, 16 Oct 2022 17:39:22 +0200 │ Phase: draft │ Summary: third commit starting line 9, appendix │ ○ changeset: 1

Re: strange python error, when running hg log (well vc-print-root-log)

2022-11-07 Thread Uwe Brauer
>>> "MK" == Marcin Kasperski writes: > Uwe Brauer writes: >>>>> "MK" == Marcin Kasperski writes: >> >>> | ** Mercurial Distributed SCM (version 5.2rc0+20200125) >>> Fairly old and pre-release version. What

how to remove a subrepository, commit also?

2022-11-06 Thread Uwe Brauer
? Regards Uwe Brauer -- Warning: Content may be disturbing to some audiences 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. https

[summary command] (was: cannot use HG > 5.2 with extension Artemis: failed to import extension artemis from)

2022-10-30 Thread Uwe Brauer
>>> "UB" == Uwe Brauer writes: > Hi > Artemis is a nice issue tracker https://www.mrzv.org/software/artemis/ > unfortunately abounded by its author. > Artemis relies on python 2.7 as far as I can see and Dan Villiom > Podlaski Christiansen tried to port

cannot use HG > 5.2 with extension Artemis: failed to import extension artemis from

2022-10-30 Thread Uwe Brauer
trying to use any of these versions and running mercurial I always obtain hg ilist --all *** failed to import extension artemis from /home/oub/ALLES/src/Artemis/artemis: No module named 'artemis' hg: unknown command 'ilist' Any idea what to do? Thanks and regards Uwe Brauer

Re: strange python error, when running hg log (well vc-print-root-log)

2022-10-30 Thread Uwe Brauer
>>> "MK" == Marcin Kasperski writes: >> | ** Mercurial Distributed SCM (version 5.2rc0+20200125) > Fairly old and pre-release version. What about using stable one at least? I just run some tests, anything above 5.2 either compiled with python 2.7 or 3.5 cannot use artemis, it always returns

Re: strange python error, when running hg log (well vc-print-root-log)

2022-10-30 Thread Uwe Brauer
>>> "MK" == Marcin Kasperski writes: >> | ** Mercurial Distributed SCM (version 5.2rc0+20200125) > Fairly old and pre-release version. What about using stable one at least? For example even 5.5 stable returns when running hg ilist --all hg ilist --all *** failed to import extension artemis

Re: strange python error, when running hg log (well vc-print-root-log)

2022-10-29 Thread Uwe Brauer
>>> "MK" == Marcin Kasperski writes: >> | ** Mercurial Distributed SCM (version 5.2rc0+20200125) > Fairly old and pre-release version. What about using stable one at least? Well I need one which works with the artemis extension (extension for local issues), it was abounded, unfortunately by

strange python error, when running hg log (well vc-print-root-log)

2022-10-27 Thread Uwe Brauer
Hi Out of a sudden I obtain the following very strange python error even when disabling all extension, I obtain the same error help would be appreciated , | | ** unknown exception encountered, please report by visiting | ** https://mercurial-scm.org/wiki/BugTracker | ** Python 2.7.12

for an emacs implementation needed: equivalent to git reset --soft

2022-10-18 Thread Uwe Brauer
e. Thanks and 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 the EU membership of the Ukraine. smime.p7s Description: S/MIME cryptographic

for an emacs implementation needed: equivalent to git reset --soft

2022-10-18 Thread Uwe Brauer
e. Thanks and 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 the EU membership of the Ukraine. smime.p7s Description: S/MIME cryptographic

how to clone/convert pull only certain changesets from a repostitory

2022-10-16 Thread Uwe Brauer
and besides a rebase of a merge seems not be possible, but I might be wrong Any comments on this issue 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

[SOLVED] (was: emacs vc-region-history: uses git log -L, is there a HG equivalent?)

2022-10-16 Thread Uwe Brauer
>>> "UB" == Uwe Brauer writes: >> hg log has a similar option: >>  -L --line-range FILE,RANGE [+] follow line range of specified file >>     (EXPERIMENTAL) > I just tested it in 5.2. My test was wrong, I tested it agai

Re: call for Emacs testers (and opinion) native support of hg ci -i

2022-10-16 Thread Uwe Brauer
> Hi Uwe, > On 10/10/2022 22:17, Uwe Brauer wrote: > Sounds really great. > This is interesting and I'd be happy to test it, if I get the time > (that is the hard part as you can imagine). Such a feature could even > get me to actually use `vc-hg`, especially if we can get the

Re: emacs vc-region-history: uses git log -L, is there a HG equivalent?

2022-10-16 Thread Uwe Brauer
tip │ Author: Uwe Brauer │ Date:Sun, 16 Oct 2022 10:10:55 +0200 │ Phase: draft │ Summary: New subsection │ ○ changeset: 2:9f72c5eed727 │ Branch: default │ Author: Uwe Brauer │ Date:Sun, 16 Oct 2022 10:10:35 +0200 │ Phase: draft │

Re: call for Emacs testers (and opinion) native support of hg ci -i

2022-10-16 Thread Uwe Brauer
Hi Georges Great that a developer is interested, sorry for the delay. > Hi Uwe, > On 10/10/2022 22:17, Uwe Brauer wrote: > Sounds really great. > This is interesting and I'd be happy to test it, if I get the time > (that is the hard part as you can imagine). Such a feature coul

emacs vc-region-history: uses git log -L, is there a HG equivalent?

2022-10-16 Thread Uwe Brauer
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

emacs vc-region-history: uses git log -L, is there a HG equivalent?

2022-10-16 Thread Uwe Brauer
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

call for Emacs testers (and opinion) native support of hg ci -i

2022-10-10 Thread Uwe Brauer
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

call for Emacs testers (and opinion) native support of hg ci -i

2022-10-10 Thread Uwe Brauer
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

  1   2   3   4   5   6   7   8   >