But it tried to merge the changes from the NEWS file in the stable tree to the NEWS file in the default tree. The merge from the NEWS from stable to NEWS.6 on default went without “complaining”. If I remember correctly, there were conflicts. In the “main” repository, I tried to merge the changes from the stable branch to the default branch. I pushed the changes from that repository to the “main” repository. For that particular change, I used the clone that is usually tracking the stable branch. I cloned that repository to another local repository (or multiple others) were I do the actual changes. I have one “main” repository that I only use for synchronizing changes with the online repository. I’m using Mercurial 5.8 mostly with TortoiseHg as an interface. Update: 1 new changesets, 2 branch heads (merge)
#TORTOISEHG CHANGE DIFF TOOL UPDATE#
Safe to assume forcing the update should be fine since it didn’t actually make any changes that could conflict?ĮTA: um, maybe not? now i have: $ hg up -checkģ files updated, 0 files merged, 0 files removed, 0 files unresolved Of course now I did a hg pull to grab the latest change and I get: $ hg up Making a couple test changes followed by hg ci / hg export shows I have 2 drafts sitting, but the commit for the NEWS file doesn’t seem to affect anything (doesn’t show up as an edited file, etc. I usually just pull a clean slate, make changes, ci/export a patch, then strip back to latest clean source state for next patch.) $ hg commit Using hg strip to force it back through commits, I go back three to get to a clean state: $ hg strip -f -no-backup -r tipĢ files updated, 0 files merged, 0 files removed, 0 files unresolvedĪllow release notes window to be opened from command line Trying to test a patch i get a $ hg patch -no-commit. GitHub-CI: Decrease time-out for some steps. When off of an outdated clean state i do a pull/update i get the following: $ hg summ
0 kommentar(er)
