Re: [git-users] Cherry picking fails for obscure reasons

2014-08-27 Thread Philip Oakley 
From: Torsten Bronger 
  To: git-users@googlegroups.com 
  Cc: philipoak...@iee.org 
  Sent: Wednesday, August 27, 2014 7:52 AM
  Subject: Re: [git-users] Cherry picking fails for obscure reasons


  Hallöchen!

  Am Mittwoch, 27. August 2014 08:34:54 UTC+2 schrieb Philip Oakley:
 
From: Torsten Bronger 
  To: git-...@googlegroups.com 
  Cc: philip...@iee.org 
  Sent: Wednesday, August 27, 2014 6:23 AM
  Subject: Re: [git-users] Cherry picking fails for obscure reasons




  Am Dienstag, 26. August 2014 20:38:56 UTC+2 schrieb Philip Oakley: 
 
- Original Message - 
  From: Torsten Bronger 
  To: git-...@googlegroups.com 
  Sent: Friday, August 22, 2014 12:24 PM
  Subject: [git-users] Cherry picking fails for obscure reasons


  The two branches to merge are in "master" and "src/master".  Then, I

  write:


  $ git checkout --orphan new-master
  $ git cherry-pick 9d325d6d 3f4c52ba
  error: a cherry-pick or revert is already in progress
  hint: try "git cherry-pick (--continue | --quit | --abort)"
  fatal: cherry-pick failed
  $ git cherry-pick 9d325d6d && git cherry-pick 3f4c52ba
  [new-master 10f0277] Initial revision.
   7 files changed, 194 insertions(+)
   create mode 100644 __init__.py
   create mode 100644 manage.py
   create mode 100644 samples/__init__.py
   create mode 100644 samples/models.py
   create mode 100644 samples/views.py
   create mode 100644 settings.py
   create mode 100644 urls.py
  [new-master 08e083c] Fixed field name in SixChambersLayer.  Added 
Sample.current_place.
   1 file changed, 2 insertions(+), 1 deletion(-)




  So, why does the first cherry pick command fail, but the split
  command works?  I use git 1.9.1.


[...]


  The gitrevisions guide suggests that giving "A B" means to, well, apply A 
and B.  I cannot see any text saying that a list of commits is forbidden.  
Besides, git's error message is opaque to me. 

  -- 

if you look in the Specifying Ranges section, you'll see that the 'list' is 
a way of specifiying a range by including and excluding your various commits in 
the list.


  I understood the implicit --no-walk that in my case, no range is specified.


  Tschö,
  Torsten.

  -- 

Ah. I hadn't followed that part (--no-walk ) through. Looks like a bit more 
thought is needed.

Do you have a simple reproduction case?

Philip
[offline for next 14 hrs..] 

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Re: [git-users] Cherry picking fails for obscure reasons

2014-08-26 Thread Torsten Bronger 
Hallöchen!

Am Mittwoch, 27. August 2014 08:34:54 UTC+2 schrieb Philip Oakley:
>
>  
> *From:* Torsten Bronger  
>
> *To:* git-...@googlegroups.com  
> *Cc:* philip...@iee.org  
> *Sent:* Wednesday, August 27, 2014 6:23 AM
> *Subject:* Re: [git-users] Cherry picking fails for obscure reasons
>
>
>
> Am Dienstag, 26. August 2014 20:38:56 UTC+2 schrieb Philip Oakley: 
>>
>>  
>> - Original Message - 
>>
>> *From:* Torsten Bronger 
>> *To:* git-...@googlegroups.com 
>> *Sent:* Friday, August 22, 2014 12:24 PM
>> *Subject:* [git-users] Cherry picking fails for obscure reasons
>>
>> The two branches to merge are in "master" and "src/master".  Then, I
>> write:
>>
>> $ git checkout --orphan new-master
>> $ git cherry-pick 9d325d6d 3f4c52ba
>> error: a cherry-pick or revert is already in progress
>> hint: try "git cherry-pick (--continue | --quit | --abort)"
>> fatal: cherry-pick failed
>> $ git cherry-pick 9d325d6d && git cherry-pick 3f4c52ba
>> [new-master 10f0277] Initial revision.
>>  7 files changed, 194 insertions(+)
>>  create mode 100644 __init__.py
>>  create mode 100644 manage.py
>>  create mode 100644 samples/__init__.py
>>  create mode 100644 samples/models.py
>>  create mode 100644 samples/views.py
>>  create mode 100644 settings.py
>>  create mode 100644 urls.py
>> [new-master 08e083c] Fixed field name in SixChambersLayer.  Added 
>> Sample.current_place.
>>  1 file changed, 2 insertions(+), 1 deletion(-)
>>
>>
>> So, why does the first cherry pick command fail, but the split
>> command works?  I use git 1.9.1.
>>
>> [...]
>>
>
> The gitrevisions guide suggests that giving "A B" means to, well, apply A 
> and B.  I cannot see any text saying that a list of commits is forbidden. 
>  Besides, git's error message is opaque to me. 
>
> -- 
>
> if you look in the Specifying Ranges section, you'll see that the 'list' 
> is a way of specifiying a range by including and excluding your various 
> commits in the list.
>

I understood the implicit --no-walk that in my case, no range is specified.

Tschö,
Torsten.

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Re: [git-users] Cherry picking fails for obscure reasons

2014-08-26 Thread Philip Oakley 
From: Torsten Bronger 
  To: git-users@googlegroups.com 
  Cc: philipoak...@iee.org 
  Sent: Wednesday, August 27, 2014 6:23 AM
  Subject: Re: [git-users] Cherry picking fails for obscure reasons




  Am Dienstag, 26. August 2014 20:38:56 UTC+2 schrieb Philip Oakley:
 
- Original Message - 
  From: Torsten Bronger 
  To: git-...@googlegroups.com 
  Sent: Friday, August 22, 2014 12:24 PM
  Subject: [git-users] Cherry picking fails for obscure reasons


  The two branches to merge are in "master" and "src/master".  Then, I

  write:


  $ git checkout --orphan new-master
  $ git cherry-pick 9d325d6d 3f4c52ba
  error: a cherry-pick or revert is already in progress
  hint: try "git cherry-pick (--continue | --quit | --abort)"
  fatal: cherry-pick failed
  $ git cherry-pick 9d325d6d && git cherry-pick 3f4c52ba
  [new-master 10f0277] Initial revision.
   7 files changed, 194 insertions(+)
   create mode 100644 __init__.py
   create mode 100644 manage.py
   create mode 100644 samples/__init__.py
   create mode 100644 samples/models.py
   create mode 100644 samples/views.py
   create mode 100644 settings.py
   create mode 100644 urls.py
  [new-master 08e083c] Fixed field name in SixChambersLayer.  Added 
Sample.current_place.
   1 file changed, 2 insertions(+), 1 deletion(-)




  So, why does the first cherry pick command fail, but the split
  command works?  I use git 1.9.1.


How are the two commits related? Do they form a commit range?


  Yes, they are consecutive commits in one of the branches. But I don't see why 
they must.  It should work in any case.


The command doesn't take a list of commits, rather you need to look at the 
gitrevisions guide and git-rev-list as decribed on the git cherry-pick man 
page. 



  The gitrevisions guide suggests that giving "A B" means to, well, apply A and 
B.  I cannot see any text saying that a list of commits is forbidden.  Besides, 
git's error message is opaque to me. 

  -- 

if you look in the Specifying Ranges section, you'll see that the 'list' is a 
way of specifiying a range by including and excluding your various commits in 
the list.

That said, I haven't looked at the part wher you get the "error: a cherry-pick 
or revert is already in progress" to see why that is.

Philip

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Re: [git-users] Cherry picking fails for obscure reasons

2014-08-26 Thread Torsten Bronger 


Am Dienstag, 26. August 2014 20:38:56 UTC+2 schrieb Philip Oakley:
>
>  
> - Original Message - 
>
> *From:* Torsten Bronger  
> *To:* git-...@googlegroups.com  
> *Sent:* Friday, August 22, 2014 12:24 PM
> *Subject:* [git-users] Cherry picking fails for obscure reasons
>
> The two branches to merge are in "master" and "src/master".  Then, I
> write:
>
> $ git checkout --orphan new-master
> $ git cherry-pick 9d325d6d 3f4c52ba
> error: a cherry-pick or revert is already in progress
> hint: try "git cherry-pick (--continue | --quit | --abort)"
> fatal: cherry-pick failed
> $ git cherry-pick 9d325d6d && git cherry-pick 3f4c52ba
> [new-master 10f0277] Initial revision.
>  7 files changed, 194 insertions(+)
>  create mode 100644 __init__.py
>  create mode 100644 manage.py
>  create mode 100644 samples/__init__.py
>  create mode 100644 samples/models.py
>  create mode 100644 samples/views.py
>  create mode 100644 settings.py
>  create mode 100644 urls.py
> [new-master 08e083c] Fixed field name in SixChambersLayer.  Added 
> Sample.current_place.
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
>
> So, why does the first cherry pick command fail, but the split
> command works?  I use git 1.9.1.
>
> How are the two commits related? Do they form a commit range?
>

Yes, they are consecutive commits in one of the branches. But I don't see 
why they must.  It should work in any case.

The command doesn't take a list of commits, rather you need to look at 
> the gitrevisions guide and git-rev-list as decribed on the git cherry-pick 
> man page. 
>  
>

The gitrevisions guide suggests that giving "A B" means to, well, apply A 
and B.  I cannot see any text saying that a list of commits is forbidden. 
 Besides, git's error message is opaque to me. 

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Re: [git-users] Cherry picking fails for obscure reasons

2014-08-26 Thread Philip Oakley 
- Original Message - 
  From: Torsten Bronger 
  To: git-users@googlegroups.com 
  Sent: Friday, August 22, 2014 12:24 PM
  Subject: [git-users] Cherry picking fails for obscure reasons


  Hallöchen!


  I try to merge two repos, yielding a flat (aka interleaved) history.
  I do this along the lines of
  , under "History
  rewrite:".


  The two branches to merge are in "master" and "src/master".  Then, I
  write:


  $ git checkout --orphan new-master
  $ git cherry-pick 9d325d6d 3f4c52ba
  error: a cherry-pick or revert is already in progress
  hint: try "git cherry-pick (--continue | --quit | --abort)"
  fatal: cherry-pick failed
  $ git cherry-pick 9d325d6d && git cherry-pick 3f4c52ba
  [new-master 10f0277] Initial revision.
   7 files changed, 194 insertions(+)
   create mode 100644 __init__.py
   create mode 100644 manage.py
   create mode 100644 samples/__init__.py
   create mode 100644 samples/models.py
   create mode 100644 samples/views.py
   create mode 100644 settings.py
   create mode 100644 urls.py
  [new-master 08e083c] Fixed field name in SixChambersLayer.  Added 
Sample.current_place.
   1 file changed, 2 insertions(+), 1 deletion(-)




  So, why does the first cherry pick command fail, but the split
  command works?  I use git 1.9.1.


  Tschö,
  Torsten.
How are the two commits related? Do they form a commit range? 

The command doesn't take a list of commits, rather you need to look at the 
gitrevisions guide and git-rev-list as decribed on the git cherry-pick man 
page. 

Philip

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.