D12372: debugdiscovery: fix a typo in the help
marmoute created this revision. Herald added a reviewer: hg-reviewers. Herald added a subscriber: mercurial-patches. REPOSITORY rHG Mercurial BRANCH default REVISION DETAIL https://phab.mercurial-scm.org/D12372 AFFECTED FILES mercurial/debugcommands.py CHANGE DETAILS diff --git a/mercurial/debugcommands.py b/mercurial/debugcommands.py --- a/mercurial/debugcommands.py +++ b/mercurial/debugcommands.py @@ -1020,7 +1020,7 @@ b'', b'remote-as-revs', b"", -b'use local as remote, with only these these revisions', +b'use local as remote, with only these revisions', ), ] + cmdutil.remoteopts To: marmoute, #hg-reviewers Cc: mercurial-patches, mercurial-devel ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
[Bug 6667] New: hg convert from svn creating broken changeset which replaces directory by a symlink
https://bz.mercurial-scm.org/show_bug.cgi?id=6667 Bug ID: 6667 Summary: hg convert from svn creating broken changeset which replaces directory by a symlink Product: Mercurial Version: 6.1 Hardware: PC OS: Linux Status: UNCONFIRMED Severity: bug Priority: wish Component: convert Assignee: bugzi...@mercurial-scm.org Reporter: pus...@ulukai.org CC: duri...@gmail.com, mercurial-devel@mercurial-scm.org Python Version: --- During my attempts to mirror an svn repo into a hg repo using hg convert, I came across a problematic changeset. It appears to delete a file in a directory, and (within the same changeset) replace that directory by a symlink. The default changeset as created by hg convert is broken; attempting to update through it always fails. As shown below, hg up fails with "abort: path '...' traverses symbolic link '...'". I was able to recreate the problematic changeset manually (shown below after the test case), and also to export the recreated changeset. However, hg import of that exported changeset fails. I assume this is a different bug, so I reported it in https://bz.mercurial-scm.org/show_bug.cgi?id= Test case: (Note: Some files in the SvarDOS repo may be allowed only for "personal noncommercial use", but they are all allowed to be redistributed.) test$ svnadmin create svn-mirror test$ echo '#!/bin/sh' > svn-mirror/hooks/pre-revprop-change test$ chmod +x svn-mirror/hooks/pre-revprop-change test$ svnsync init "file://$PWD/svn-mirror" svn://svn.svardos.org/svardos Copied properties for revision 0 (svn:sync-* properties skipped). test$ svnsync sync "file://$PWD/svn-mirror" > /dev/null test$ hg convert --config hooks.pretxncommit.checkcommitmessage=true svn-mirror converted.hg --rev 670 --config convert.svn.startrev=660 initializing destination converted.hg repository scanning source... sorting... converting... 10 clarify system for pkgnet command 9 provide German translation for pkg.ama 8 unicode.map is not stored in svn, and title version autogenerated 7 help no longer copied to web root, use a link file instead and point phpamb to a dir 6 multi-lang help selector 5 change encoding from ANSI to UTF-8 4 changed wording 3 added FreeDOS 1.3 and fixed typo 2 translated help-de/freedos.ama to German 1 help screen suggests *.svp for extension of package files + version bump to 20 220214 + source code package generated via makefile 0 ver 20220214 frozen to tags test$ hg -R converted.hg/ up abort: path 'website/help/help-en.amb' traverses symbolic link 'website/help' test$ Script showing how to manually recreate the problematic changeset: (in this case the hg repo was created without a convert.svn.startrev config option; fdbfba91f is the problematic changeset) hg up -r "parents(fdbfba91f)" hg cat -r fdbfba91f website/index.php > website/index.php hg rm website/help/help-en.amb hg rm website/help ln -s ../help website/help hg add website/help hg ci -m "help no longer copied to web root, use a link file instead and point p hpamb to a dir" -d "Sat Feb 12 20:39:48 2022 +" -u "mateusz.viste" --config hooks.pretxncommit.checkcommitmessage=true -- You are receiving this mail because: You are on the CC list for the bug. ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
[Bug 6666] New: hg import rejects exported changeset in which a directory is emptied and replaced by a symlink
https://bz.mercurial-scm.org/show_bug.cgi?id= Bug ID: Summary: hg import rejects exported changeset in which a directory is emptied and replaced by a symlink Product: Mercurial Version: 6.1 Hardware: PC OS: Linux Status: UNCONFIRMED Severity: bug Priority: wish Component: Mercurial Assignee: bugzi...@mercurial-scm.org Reporter: pus...@ulukai.org CC: mercurial-devel@mercurial-scm.org Python Version: --- I came across this bug while trying to fix a repo made from an svn mirror using hg convert. I assume that the original error was made by convert. However, when I tried to save the corrected changeset using hg export, I found that I could not import it again using hg import. The following simple test case depicts the error that the hg import gets in this case. test$ hg --version Mercurial Distributed SCM (version 6.1) (see https://mercurial-scm.org for more information) Copyright (C) 2005-2022 Olivia Mackall and others This is free software; see the source for copying conditions. There is NO warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. test$ hg init . test$ mkdir dirtest test$ mkdir target test$ touch target/foo test$ touch dirtest/bar test$ hg add target/foo dirtest/bar test$ hg ci -m "initial commit" test$ hg rm dirtest/bar test$ hg rm dirtest test$ ln -s target dirtest test$ hg add dirtest test$ hg d diff --git a/dirtest b/dirtest new file mode 12 --- /dev/null +++ b/dirtest @@ -0,0 +1,1 @@ +target \ No newline at end of file diff --git a/dirtest/bar b/dirtest/bar deleted file mode 100644 test$ hg ci -m "turn directory into symlink" test$ hg export > export test$ hg strip -r tip 1 files updated, 0 files merged, 1 files removed, 0 files unresolved saved backup bundle to [home]/test/20220311/test/.hg/strip-backup/0061a6917873-cd9c34cf-backup.hg test$ hg import export applying export abort: Is a directory: '[home]/test/20220311/test/dirtest' test$ -- You are receiving this mail because: You are on the CC list for the bug. ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
[Bug 6665] New: Does Cash App ++ Actually Work To Let You Meet Your Needs?
https://bz.mercurial-scm.org/show_bug.cgi?id=6665 Bug ID: 6665 Summary: Does Cash App ++ Actually Work To Let You Meet Your Needs? Product: Mercurial Version: unspecified Hardware: PC OS: Windows Status: UNCONFIRMED Severity: feature Priority: wish Component: acl Assignee: bugzi...@mercurial-scm.org Reporter: adamkent2...@gmail.com CC: mercurial-devel@mercurial-scm.org Python Version: --- With the Cash App account, you will be able to meet your financial needs and requirements without any kind of hassle. What you should do to understand how Does Cash App ++ Actually Work? You have to keep the fact in mind that you can’t use the cracked version of the Cash App to do the same. https://www.emailsupport-contact.com/blog/how-do-i-get-cash-app-plus-plus/ -- You are receiving this mail because: You are on the CC list for the bug. ___ Mercurial-devel mailing list Mercurial-devel@mercurial-scm.org https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
