Seem like TortoiseHg problem indeed, messing around a bit we could make the problem goes away but commiting (no change seen or revison changed) when merging with TortoiseHg.
Thanks for the tips [image: bodycad] <https://www.bodycad.com/> Jerome Godbout Software Developer 2035 rue du Haut-Bord, Québec, QC, Canada. G1N 4R7 T: +1 418 527-1388 E: [email protected] www.bodycad.com The contents of this email message and any attachments are intended solely for the addressee(s) and may contain confidential and/or privileged information and may be legally protected from disclosure. If you are not the intended recipient of this message or their agent, or if this message has been addressed to you in error, please immediately alert the sender by reply email and then delete this message and any attachments. If you are not the intended recipient, you are hereby notified that any use, dissemination, copying, or storage of this message or its attachments is strictly prohibited. Le contenu de ce message et les pièces jointes sont destinés uniquement pour le(s) destinataire(s) et peuvent contenir des informations confidentielles et / ou privilégiées qui peuvent être protégées légalement contre toute divulgation. Si vous n'êtes pas le destinataire de ce message ou son agent, ou si ce message vous a été adressé par erreur, s’il vous plaît avertir immédiatement l'expéditeur par courriel de réponse, puis supprimer ce message et les pièces jointes. Si vous n'êtes pas le destinataire prévu, vous êtes par la présente informé que toute utilisation, diffusion, copie, ou stockage de ce message ou de ses pièces jointes est strictement interdit. On Sat, Feb 18, 2017 at 10:07 PM, Yuya Nishihara <[email protected]> wrote: > On Sat, 18 Feb 2017 08:37:34 -0800, Ludovic Chabant wrote: > > I'm not sure I totally understand your problem but I know that I had a > > lot less problems with subrepos the day I understood that Mercurial > > wants a "global commit" to update and manage the .hgsubstate file and > > the other subrepo-related stuff. By "global commit" I mean a commit that > > does not specify files to commit, or use any exclude patterns. Basically > > a straight up "hg commit". > > > > So maybe you have problems because you're trying to run something like > > "hg commit .hgsub", or some other filtered-down commit? > > > > > Jérôme Godbout <mailto:[email protected]> > > > February 18, 2017 at 6:42 AM > > > The problem is that hg doesn't let me commit the file telling me that > > > there is no local change event if .hgsubstate have modification where > > > I remove the removed subrepos revision entry. When updating to > > > revision Tortoisehg complain about it that something need to be > > > commit. but I can't commit that file change even by command line. > > Short answer: Don't use TortoiseHg to remove subrepos, run "hg ci" instead. > > Long answer: This appears to be a bug of TortoiseHg and Mercurial. When > adding > a subrepo, THg runs: > > % hg ci .hgsub subrepodir > > If the subrepodir is excluded, Mercurial would complain about that: > > % hg ci .hgsub > abort: commit with new subrepo subrepodir excluded > > But when removing, THg doesn't include the removed subrepodir: > > % hg ci .hgsub > > and it passes without an error. Also, the subrepodir can't be specified > explicitly: > > % hg ci .hgsub subrepodir > abort: subrepodir: no match under directory! >
_______________________________________________ Mercurial mailing list [email protected] https://www.mercurial-scm.org/mailman/listinfo/mercurial
