Stack Overflow
Stack Overflow

Questions tagged [transplant]

18 questions
6
votes
2 answers

Transplant into workspace without commiting

Is there a way to have transplant a single changeset without commiting? I'd like to be able to review the changes prior to doing a commit.
Robert Jeppesen
  • 7,837
  • 3
  • 35
  • 50
3
votes
1 answer

Mercurial - Rebase branch of old code on top of new code tip, ignoring branch's merges with old code

I was playing around with the Adium source code and discovered that they had an unreleased branch in the adium-1.4 that fixes the facebook chat integration by using XMPP, called facebook-xmpp. All good there, complied it and it works. Problem is, if…
Dan
  • 3,490
  • 2
  • 22
  • 27
2
votes
2 answers

How to achieve a private branch in git that "floats" when merging with upstream?

I have a fork of another organization's repository. I'm at the the latest tag in the repo, which is not the head, and I've created a branch from that tag which will never be pushed upstream. That's why I consider the branch private. I've made…
Binary Phile
  • 2,538
  • 16
  • 16
2
votes
2 answers

How to transplant patches in svn

I used to use git to port features between different branches, rebase, rebase --onto, cherry-pick are typical tools I used. But now I have to work with svn. I don't like to use svn's built in merge command, cause it will combine all the commits into…
Terry Shi
  • 968
  • 1
  • 10
  • 14
1
vote
1 answer

In mercurial, is there a way to merge during transplant?

It seems like what transplant does is to make a patch out of the changeset(s) and apply it on top of the target, similar to qimport -r then qpush. Therefore when some hunks fail to apply, you'd get reject files and have to "fix up the merge"…
Geoffrey Zheng
  • 6,562
  • 2
  • 38
  • 47
1
vote
1 answer

Printing transplant source changeset hash

We've transplanted a changeset from another repository to the current one. It seems to us that the transplant extensions stores the original changset hash in an extra field which can be shown with hg log --debug, like: changeset: 720:092506 tag: …
palacsint
  • 28,416
  • 10
  • 82
  • 109
0
votes
2 answers

In hg, how can I drop the branch name when rebasing and/or transplanting from another repo?

Basically, what I want to try is pulling hg revisions from a branch of an experimental repo into a clone of mainline. But I want to discard the branch name so I can push directly into the server-side mainline repo. It's probably best to give a…
Matthew Flaschen
  • 278,309
  • 50
  • 514
  • 539
0
votes
2 answers

Transplanting into one changeset

I'm trying to move changes from a couple of changesets into one changeset on the other branch. There are other changes in between that I want to skip, so I don't want to simply merge everything. hg transplant moves the changes correctly, but now I'd…
viraptor
  • 33,322
  • 10
  • 107
  • 191
0
votes
2 answers

How to migrate my cakephp2 project to cakephp3?

I want to migrate my cakephp2 project to cakephp3. I must retain the user's information. How to make them have the same way of generating a password? Here's how I generate passwords in cakephp2. App::uses('AuthComponent',…
user3068563
  • 15
  • 3
0
votes
1 answer

mercurial transplant a merge commit

I have two diffrenet Mercurial repos, the A and the S. The repos S has two branches with two heads and some merges between the branches. I want to transplant this two branches preserving its names and the structure onto the revision N of the repo…
0x2207
  • 878
  • 1
  • 6
  • 20
0
votes
2 answers

In Mercurial (hg), how do you query the hg database for changeset information?

I have a changeset, 32ada6b3ff3fd4b5d2d0e3da4ba72c5634da7857. This changeset has been transplanted and merged into various branches. Following a transplant from branch to branch is fairly easy. The transplant information shows up doing an "hg log…
user2569618
  • 517
  • 3
  • 16
  • 42
0
votes
2 answers

how to transplant linux shell command from linux to android

Can anyone tell me how to transplant linux shell command (such as : ls ,cat and tar) from linux to android. what i think is to do as follow: 1、download the sourcecode 2、execute the command :./configure ( with some params ) CC=arm-linux-android(use…
wangxigui
  • 35
  • 5
0
votes
0 answers

windows phone empty dynamic link library : visual C++

Does any one know about this type of windows phone 8 project in vs 2012? windows phone empty dynamic link library , visual C++ I build a project of this type and produced a dll, then I tried to add this dll as a reference only to get this message:…
Yinthewind
  • 55
  • 1
  • 6
0
votes
1 answer

Is it hard to transplant my ios app to android app?

I have some ios app want to achieve to deploy to the android play market, is it hard to do it? I know how to develop object c program, but not familiar with the android coding. Any suggestion would be appreciated! Thanks!
user1652625
  • 13
  • 1
  • 4
0
votes
1 answer

HexBinaryAdapter in C#?

I want to use C# to implement encoding function which is written in Java, but it has some code I've never seen before. HexBinaryAdapter().unmarshal("publicKey"); Is there any similar API or method in C# or I also need to implement it?
user1531714
  • 111
  • 13
1
2