Questions tagged [mercurial-subrepos]

Questions related to the subrepository feature in the Mercurial distributed version control system.

Questions related to the subrepositories feature in the Mercurial distributed version control system.

129 questions
4
votes
1 answer

How to merge a feature branch to default with subrepositories with Mercurial

I have numerous projects with subrepositories: /project <- Main repository /project/src <- Source code subrepository (subrepository to /project) /project/src/module <- Module subrepository (subrepository to /project/src…
Prembo
  • 2,256
  • 2
  • 30
  • 50
3
votes
4 answers

How to configure mercurial to deploy website folder only

I have a website that I want to deploy to a clients DEV and UAT environments, the site is part of a mercurial repo - it is in the Website folder at the same level as the .hg folder. I know I can push the entire repository but would rather push only…
Simon Martin
  • 4,203
  • 7
  • 56
  • 93
3
votes
1 answer

Mercurial update doesn't work for subrepo if subrepo belongs to two main repos?

Take this repo structure: Server (main repo) ProjectA (subrepo) SharedLibrary (subrepo) Client (main repo) ProjectB (subrepo) SharedLibrary (subrepo) SharedLibrary points to the same folder (this is Windows), it is not a separate…
Casey Wilkins
  • 2,555
  • 2
  • 23
  • 31
3
votes
1 answer

Mercurial [subpaths] containing absolute path is appended to main repo's default path when pushing

Running Mercurial 2.0.2 on Windows: In my .hgrc: [subpaths] MYREPOS/(.*) = https://server/repos/\1 And in my .hgsub: subrepo/lib = MYREPOS/lib When I do a push, the push path of the sub repo is the concatenation of it's path to the main repo,…
Lee Atkinson
  • 2,171
  • 3
  • 20
  • 32
3
votes
2 answers

Mercurial error with subrepos on windows

I have critial problem with Mercurial configured with subrepos. When I try to commit or make update I get following error: hg commit -m "commit" --traceback Traceback (most recent call last): File "mercurial\dispatch.pyc", line 87, in _runcatch File…
lstachowiak
  • 344
  • 1
  • 2
  • 7
3
votes
1 answer

Mercurial common/local files

I'm an hg user since a couple a years and I'm happy about that! I have to start a project as I never did before. The idea is to develop a software with a batch mode and an GUI. So there will be common sources to both batch and GUI mode but each one…
user378147
3
votes
1 answer

Is there a way to get "hg extdiff" to include subrepositories?

I would like to configure Mercurial to be able to do something like "hg diff -S", but with an external diff tool (kdiff3, specifically). The logical way to do this would be something like hg extdiff -S -p kdiff3 However, this does not work because…
3
votes
1 answer

How to push Mercurial subrepositories to their own origin

I am using subrepositories to share code between multiple projects. I keep the "master" version of these shared repositories in a central location. That way I can easily push changes I made to them in one project and pull them in another. That…
Karsten
  • 1,814
  • 2
  • 17
  • 32
3
votes
1 answer

How can I make "commit" abort if there are uncommitted subrepo changes in Mercurial?

This seems to happen all the time to me: I work on the parent repo. I find and fix a bug in a subrepo. I carry on with parent repo work. I commit the parent repo with a message like "Added feature X". I push. At this point I notice that the subrepo…
Roman Starkov
  • 59,298
  • 38
  • 251
  • 324
2
votes
2 answers

How to preserve Mercurial subrepo remappings across clone/pull?

I'm trying to set up subrepo remapping in Mercurial (2.1.1) to account for subrepo paths that may change in the future. I've been able to get the [subpaths] key to be read and processed properly when it is specified in the .hgrc file. However, when…
arathorn
  • 2,098
  • 3
  • 20
  • 29
2
votes
1 answer

How can I configure TortoiseHg Workbench to use the --subrepos switch

I'd like to know how I can configure TortoiseHg Workbench so it alawys supplies the --subrepos switch when checking status. I can do this with the commandline no problem. I only need to do this for this 1 repository - it is the only repo that has a…
Simon Martin
  • 4,203
  • 7
  • 56
  • 93
2
votes
1 answer

Mercurial internals : Git subrepository status after aggressive permission change

Disclaimer : I'm not asking for a solution, a workaround or any kind of advice on how to do things, I'm just curious about the internals of Mercurial. I have a mercurial repository with some subrepository in it (Git and Mercurial). My repository …
krtek
  • 26,334
  • 5
  • 56
  • 84
2
votes
1 answer

Mercurial: Converting existing folders into sub-repos

I have a Mercurial repository that looks like this: SWClients/ SWCommon SWB SWNS ...where SWCommon is a a library common to the other two projects. Now, I want to convert SWCommon into a sub-repository of SWClients, so I followed the…
McKrassy
  • 961
  • 2
  • 10
  • 19
2
votes
1 answer

Mercurial, updating subrepo location

One of my subrepo url got changed and I had to update all my projects to use the new location. I happen to have the working clones of all the projects that use that subrepo. But what if I didn't have a working copy of one of them, how could I clone…
Orhun
  • 324
  • 2
  • 6
2
votes
2 answers

Tagging a subrepository only

I have a Mercurial main-repository with one sub-repository, like this: Main .hg .hgsub .hgsubstate Sub .hg And I wish to tag Sub, only, while keeping…
1 2
3
8 9