| 1 |
>>>>> On Mon, 29 Jul 2013, Rich Freeman wrote: |
| 2 |
|
| 3 |
> git clone https://github.com/MythTV/mythtv.git -b fixes/0.26 |
| 4 |
> cd mythtv/ |
| 5 |
> git format-patch v0.26.0 |
| 6 |
> mv *.patch .. |
| 7 |
> git checkout v0.26.0 |
| 8 |
> patch -p0 < ../0001-* |
| 9 |
|
| 10 |
> Final output is: |
| 11 |
> can't find file to patch at input line 17 |
| 12 |
> (messing with -p doesn't help, which will be obvious from a quick |
| 13 |
> inspection of the file vs the tree) |
| 14 |
|
| 15 |
> How can git format-patch against a tag generate a patch that won't |
| 16 |
> apply against that tag? |
| 17 |
|
| 18 |
> If you look at the git log of that branch you'll find that the first |
| 19 |
> patch is from a commit that is more distant in the past than the tag. |
| 20 |
|
| 21 |
Is the history from the v0.26.0 tag to the tip of the branch linear? |
| 22 |
If it contains merge commits, then git format-patch / git am isn't |
| 23 |
guaranteed to work. |
| 24 |
|
| 25 |
Ulrich |
Archives