git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Endre Czirbesz <endre@czirbesz.hu>
To: Vitor Antunes <vitor.hda@gmail.com>
Cc: Tor Arvid Lund <torarvid@gmail.com>,
	git@vger.kernel.org, Ian Wienand <ianw@vmware.com>
Subject: Re: git to p4 conversion
Date: Mon, 7 Feb 2011 13:57:18 +0000	[thread overview]
Message-ID: <AANLkTimP81rVPwvpaCSgBJiZ2Jm131+Q9E-Fkj0-jZfd@mail.gmail.com> (raw)
In-Reply-To: <AANLkTimV1aRiEMa2z-H2bOvRa9H6YAyET1=hn+_O0-0u@mail.gmail.com>

Hi,

Thanks for your patience and the detailed help.
I forgot only one thing, that I need two separate directories... :)

So, after some minor mods in git-p4 (I have some directories with
spaces, and some files with #@*% in their names), it seems as if it
worked, my files are in P4 depot, although I got an error message:

Failed to merge in the changes.
Patch failed at 0001 Initial commit

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To restore the original branch and stop rebasing run "git rebase --abort".

Exception: command failed: git rebase remotes/p4/master

Regards,

Endre

  reply	other threads:[~2011-02-07 13:57 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-02-03 13:52 git to p4 conversion Endre Czirbesz
2011-02-03 18:23 ` Ian Wienand
2011-02-03 19:50   ` Endre Czirbesz
2011-02-04  0:03     ` Vitor Antunes
2011-02-04  9:25       ` Tor Arvid Lund
2011-02-04 10:49         ` Endre Czirbesz
2011-02-04 14:01           ` Tor Arvid Lund
2011-02-04 16:08             ` Endre Czirbesz
     [not found]               ` <AANLkTimGaPQ=hRp+2pvw-hAOg+wp50nvc_sv9jNTay=n@mail.gmail.com>
2011-02-04 16:52                 ` Endre Czirbesz
2011-02-05  0:53                   ` Tor Arvid Lund
2011-02-05  1:11                     ` Vitor Antunes
2011-02-07 13:57                       ` Endre Czirbesz [this message]
2011-02-07 14:13                         ` Tor Arvid Lund
2011-02-07 15:07                           ` Endre Czirbesz

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=AANLkTimP81rVPwvpaCSgBJiZ2Jm131+Q9E-Fkj0-jZfd@mail.gmail.com \
    --to=endre@czirbesz.hu \
    --cc=git@vger.kernel.org \
    --cc=ianw@vmware.com \
    --cc=torarvid@gmail.com \
    --cc=vitor.hda@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).