Questions tagged [kiln]

Kiln is Fog Creek's distributed version control system based on Mercurial. Kiln aims to simplify the power of DVCS for teams of all sizes and includes an integrated code review system.

Kiln is Fog Creek's distributed version control system based on Mercurial.

Kiln aims to simplify the power of DVCS for teams of all sizes and includes an integrated code review system.

78 questions
6
votes
2 answers

Mercurial/Kiln how can I get a deleted file without affecting my other files?

I have a file that was deleted a few changesets ago. As you can imagine, the other files in my project have changed since then. How can I get back that file (it's actually 2 files) without reverting all the other source files?
Pete
  • 10,651
  • 9
  • 52
  • 74
5
votes
6 answers

How to solve a Mercurial case-folding collision?

I use Mercurial as source control with the main repository managed on KILN. At one point in time I changed my iOS project name from WeatherTimeMachine to weathertimemachine. This resulted in a case change of several files and…
MiKL
  • 1,850
  • 1
  • 15
  • 23
5
votes
1 answer

What are the best practices for Kiln repositories?

I noticed in this image from the Kiln site that the repositories are named stable, qa and devel. Is there any reasoning behind this? Or is there a better/different way that's more accepted?
dandax
  • 1,267
  • 3
  • 15
  • 22
4
votes
1 answer

Mercurial repository with bitbucket subrespository - how to prevent push

I am in the process of setting up some third-party subrepositories under a Mercurial repository. One subrepo is another Mercurial repo hosted on Bitbucket. Since it is a public repo, and I am not a contributor to it, I don't wish to push back to it.…
unsynchronized
  • 4,828
  • 2
  • 31
  • 43
4
votes
2 answers

Sharing a Mercurial repository while maintaining user privacy

I have a commercial product, and I'd like to make source code licenses an option for my customers. In an ideal world: Customer would buy a source license Send me their BitBucket user name Receive an invite to a private BitBucket repository From…
Paul Stovell
  • 32,377
  • 16
  • 80
  • 108
4
votes
5 answers

Is there a way to review someone's code before they push in Mercurial?

I would like to be able to review other developers code before they push it to central repository. The developers are at remote locations so going to their desk is not an option. Currently they just push and if there are issues they would rollback.…
Eric P
  • 2,907
  • 2
  • 24
  • 33
4
votes
2 answers

Kiln integration with JIRA

We are happy with JIRA and there is no willingness to move away from it. At present we have JIRA integrated well with Perforce. However we are considering moving to Kiln. Losing the integration with JIRA would be a blocker.
Ian Ringrose
  • 51,220
  • 55
  • 213
  • 317
4
votes
1 answer

Perforce to Mercurial Import

I'm trying to move over some repositories from Perforce to Kiln (FogBugz's Mercurial-based companion VCS), and I'm having some issues. As Kiln does not port directly from Perforce, I'm going via the Perforce -> Mercurial -> Kiln approach, but I'm…
Ed James
  • 10,385
  • 16
  • 71
  • 103
3
votes
1 answer

Fix bad merge in mercurial

In our mercurial project configuration we have 3 branches in a single repository. One is a stable release branch where urgent bug fixes are done, one is a feature branch which contains new feature code and one is a UAT branch where both bug fixes…
smithy
  • 61
  • 5
3
votes
1 answer

Merge with kiln (mercurial )

What are the best way to merge in kiln with another repository. we have 3 repositories 1.7.5 1.7.6 main-dev So I fix a bug in an older version (1.7.5). That fix I would like to merge with version 1.7.6, repository and in our main-dev…
gman
  • 45
  • 5
3
votes
2 answers

Anyone manage their Continuous Integration with TeamCity, FinalBuilder, and Mercurial (Kiln)?

Possible Duplicate: Continuous Integration stack on Windows with Mercurial + Mercurial Queues? If so, what does your build process look like? I'm having a difficult time (mostly because of my lack of experience/understanding of all 3 tools)…
Jon Erickson
  • 112,242
  • 44
  • 136
  • 174
3
votes
2 answers

How to manage branches with Kiln using Git?

My company is using Kiln so developers can use their preferred tool between Git and Mercurial. I’m a Git user and never used Mercurial. There are some incomprehensions in the use of branches with Kiln. When I create a new branch using the Kiln…
lesenk
  • 793
  • 1
  • 8
  • 22
3
votes
1 answer

Defining a Jenkins Build Job Based on a Kiln Mercurial Repository

I have a Jenkins instance with the Mercurial plugin installed on a Windows 2008 R2 machine. I am trying to define a build job for a Maven project on my KilnHQ repository. The HG clone step fails to retrieve code due to authentication failure. I've…
Danish
  • 3,708
  • 5
  • 29
  • 48
2
votes
1 answer

Got inconsistent Mercurial subrepository state (RepoLookupError) twice per day. How is that possible?

Recently migrated to Mercurial. Due to heavy use of externals in old SVN repo we are using Subrepos accordingly and have a CI server that does pulls / pushes to central repositories often. So it's a bit hard to trace what exactly happened and…
2
votes
1 answer

how do you define which changeset a kiln/mercurial subrepository uses?

In the answer to this question on the kiln stack exchange site, there is a comment that mentions "if you commit from one consumer of the library, the other library consumers do not immediately see those changesets. You have to explicitly pull the…
unsynchronized
  • 4,828
  • 2
  • 31
  • 43