dvcs

ISO Mercurial “attributes” - tags that apply to more than one changeset, applied after the changeset

白昼怎懂夜的黑 提交于 2019-12-10 17:22:41
问题 BRIEF How do I tag multiple changesets in Mercurial with the same tag? Possibly on the same branch, possibly on different branches. E.g. something like a tag that says whether the full QA test ran. I can create multiple instances of a tag by editing the file, but the hg tools nearly always ignore all but the first. DETAIL I am looking for what I call changeset "attributes" - a concept that I have used in other CVS and DVCS, but which I cannot seem to find in Mercurial. Basically, an attribute

preserving history when using mercurial ontop of clearcase

不问归期 提交于 2019-12-10 16:55:49
问题 I work in a ClearCase shop and CC does a good job of integrating the team's work though our code review process prevents me from using it to track my daily changes. Creating an hg repository on top of my CC view works really well. I can track my changes and easily make backups on the file server, produce diffs for people etc. This is all well and good until I move to a new CC view and have to leave my history behind. I would love to be able to ?pull? my previous history in and have everything

Mercurial and NTFS Alternate data stream

戏子无情 提交于 2019-12-10 13:08:05
问题 How does Mercurial handle Alternate Data Streams (in the NTFS file system)? If it can't handle that, is there a DCVS that does? EDIT: When I change version with update , what happens to the ADS ? Is it lost (erased)? Is it versioned too? Is it alltogether ignored? 回答1: Mercurial does not store alternate data stream. Additionally, they are likely to be overwritten on update. I don't think any of the open source VCS I know handle that kind of thing (even permissions are usually not handled). 来源

Seeing what revision goes with a tag in Git

孤者浪人 提交于 2019-12-10 12:31:37
问题 Beginner Git question: In the Mercurial world, hg tags gives me a list of tags and the corresponding revisions, whereas git tag only lists the tag names. How do I see what the matching rev number/hash is? 回答1: For full information associated with that tag, use command git show v1.5 Or you can see the lightweight information, skipping details, by command git show v1.5 -lw 回答2: If tag in question is so called 'heavyweight tag', or annotated tag, utilizing tag object, e.g. PGP signed version (as

alternative to rebasing pushed commits

梦想的初衷 提交于 2019-12-10 11:29:26
问题 The GitHub documentation recommends against rebasing commits that have been pushed publicly. We have two branches master and dev . I have made a change to master for a hotfix that I would like to take across to dev , dev itself is fairly far ahead of master . In this case the hotfix is to 2 files and is only a 1 line change in each. What is the easiest way to get this to the dev branch without confusing things terribly? 回答1: If the hotfix is the only thing in master that isn't in dev you

Why is mercurial dumb when merging? How can I make pulling/merging changes simpler?

ぐ巨炮叔叔 提交于 2019-12-10 11:11:38
问题 I just started to use Mercurial and I think I'm trying to do something very simple, something that should be quite typical, but I'm stumped on why it's so complicated, and why it doesn't just work the way it should (IMO). I share some a repository with a friend, he makes some changes and checks in several files and pushes them. Now in svn I'm used to just updating my working copy and getting his changes, no hassle. But with mercurial apparently I have to merge. What I don't get is: shouldn't

Unification of DVCS commands

孤人 提交于 2019-12-10 10:09:17
问题 When working on multiple (open source) projects, multiple version controll systems start to be problematic. While they share common operations, I often make mistakes by typing hg add instead git add . I remember seeing project some time ago that made access to different source control software in uniform way by providing basic commands commit/ci add etc. in shell. Depending on repository it would in turn call hg add or git add etc. I've seen Amp: http://amp.carboni.ca/ (which seems to be down

Why do you use Git over Mercurial? (Or vice versa.) [closed]

牧云@^-^@ 提交于 2019-12-09 07:37:57
问题 As it currently stands, this question is not a good fit for our Q&A format. We expect answers to be supported by facts, references, or expertise, but this question will likely solicit debate, arguments, polling, or extended discussion. If you feel that this question can be improved and possibly reopened, visit the help center for guidance. Closed 7 years ago . I currently use Git, and am generally happy with it, but I'd like to know more about Mercurial. Does it have any advantages over Git?

Git remove directory

邮差的信 提交于 2019-12-09 04:29:20
问题 I've got a repository on GitHub (http://github.com/hrickards/PHP-Crypto) for a little project me and a couple of others are working on. My development environment is Aptana Studio, and I use the EGit plugin as Aptana is basically Eclipse underneath. Today the designer sent the HTML and CSS for the website with the images in a folder named img. Previously the images were in a folder called images. Thinking nothing of it and being too lazy to update the CSS and HTML, I simply kept the images in

Delete all local changesets and revert to tree

家住魔仙堡 提交于 2019-12-09 04:00:25
问题 I'm using Mercurial and I've got into a terrible mess locally, with three heads. I can't push, and I just want to delete all my local changes and commits and start again with totally clean code and a clean history. In other words, I want to end up with (a) exactly the same code locally as exists in the tip of the remote branch and (b) no history of any local commits. I know hg update -C overwrites any local changes. But how do I delete any local commits? To be clear, I have no interest in