mercurial

Version-controlling zipped files (docx, odt)

╄→尐↘猪︶ㄣ 提交于 2020-01-30 16:25:10
问题 There are formats that are actually zip files in disguise, e.g. docx or odt. If I store them directly in version control, they are handled as binary files. My ideal solution would be have a hook that creates a foo.docx/ directory for each foo.docx files before commit, unzipping all files into it optionally, have a hook that reindents the xml files have a hook that recreates foo.docx from the stored files after update I don't want the docx files themselves to be version-controlled. (I am aware

how to view previous version of a file in Mercurial

为君一笑 提交于 2020-01-30 14:19:37
问题 I am using mercurial for version control of a few files in a directory. Suppose I have 10 commits (10 changesets or revisions). I want to just view how a particular file, say thisFile.py, looked in its 7th revision. I don't want to revert back to this older version. I don't want to go and make any changes or fix any bugs in this previous version. I simply want to see it, without affecting the latest version of the file or the mercurial history in any way. Is there a simple way to do it? 回答1:

How do I find the merge that moved my changeset to another branch?

独自空忆成欢 提交于 2020-01-29 19:17:30
问题 I made a change a few months ago in a file in the default branch. Today we discovered that change somehow got merged into another branch. When I run hg log against that file, I'm only seeing the original changeset. I'm not seeing how that changeset made it into the branch. What revset query can I pass to hg log to trace a changeset as it gets merged between branches? 回答1: If the changeset in question lives on a named branch, you can use hg log -r 'descendants(<the_rev>) and branch(default)' ,

How do I find the merge that moved my changeset to another branch?

守給你的承諾、 提交于 2020-01-29 19:17:18
问题 I made a change a few months ago in a file in the default branch. Today we discovered that change somehow got merged into another branch. When I run hg log against that file, I'm only seeing the original changeset. I'm not seeing how that changeset made it into the branch. What revset query can I pass to hg log to trace a changeset as it gets merged between branches? 回答1: If the changeset in question lives on a named branch, you can use hg log -r 'descendants(<the_rev>) and branch(default)' ,

How do I find the merge that moved my changeset to another branch?

℡╲_俬逩灬. 提交于 2020-01-29 19:16:06
问题 I made a change a few months ago in a file in the default branch. Today we discovered that change somehow got merged into another branch. When I run hg log against that file, I'm only seeing the original changeset. I'm not seeing how that changeset made it into the branch. What revset query can I pass to hg log to trace a changeset as it gets merged between branches? 回答1: If the changeset in question lives on a named branch, you can use hg log -r 'descendants(<the_rev>) and branch(default)' ,

How do I find the merge that moved my changeset to another branch?

瘦欲@ 提交于 2020-01-29 19:16:06
问题 I made a change a few months ago in a file in the default branch. Today we discovered that change somehow got merged into another branch. When I run hg log against that file, I'm only seeing the original changeset. I'm not seeing how that changeset made it into the branch. What revset query can I pass to hg log to trace a changeset as it gets merged between branches? 回答1: If the changeset in question lives on a named branch, you can use hg log -r 'descendants(<the_rev>) and branch(default)' ,

Mercurial HG pull specific “no changes” yet files different

限于喜欢 提交于 2020-01-25 12:57:04
问题 My local file and mercurial revision are at different stages however hg pull & hg update default returns a no changes message. On bitbucket my repo and revision I am trying to pull to local machine is https://bitbucket.org/sayth/pyxml/src/c63b5ce2119ae64331ee2551fc19083315be0571/xrace.py [sayth@localhost pyXML]$ hg pull && hg update default pulling from https://bitbucket.org/sayth/pyxml searching for changes no changes found 0 files updated, 0 files merged, 0 files removed, 0 files unresolved

How to use `hg cat` from an empty working directory?

拈花ヽ惹草 提交于 2020-01-24 11:16:09
问题 I have a repo located at x:/projects/repo1. The working directory has been emptied using hg update null . I want to extract the latest version of some files from there to a local directory. I tried this: x:\projects\repo1> hg cat -o c:\sql\%s scripts\*.sql -r tip I get this error: scripts\*.sql: No such file in rev 14f07c26178b The same command works fine if the working directory is not empty. Is there a good reason why this does not work? Or do you know another way of extract some files from

Automating Review Requests with ReviewBoard and Mercurial using Python hooks

对着背影说爱祢 提交于 2020-01-22 10:07:42
问题 Here is my problem: I got a remote mercurial repository where the hook is gonna be setup either incoming or changegroup, and I got a ReviewBoard setup on a different server. The idea is to automate review request tickets generation upon push from devs into the remote repository. Of course, I would need a hook that invoke post-review that also uses submit-as user which extracted using the mercurial api (ctx.user()), or else all the review requests tickets would be in the name of the user that

Automating Review Requests with ReviewBoard and Mercurial using Python hooks

∥☆過路亽.° 提交于 2020-01-22 10:07:06
问题 Here is my problem: I got a remote mercurial repository where the hook is gonna be setup either incoming or changegroup, and I got a ReviewBoard setup on a different server. The idea is to automate review request tickets generation upon push from devs into the remote repository. Of course, I would need a hook that invoke post-review that also uses submit-as user which extracted using the mercurial api (ctx.user()), or else all the review requests tickets would be in the name of the user that