bugGNU arch -- a revision control system - Bugs: bug #9162, star-merge not finding files to...

 
 

bug #9162: star-merge not finding files to patch where it should

Submitted by:  Duck <theduck>
Submitted on:  Sun 30 May 2004 03:17:33 PM UTC  
 
Category: tlaSeverity: 3 - Normal
Item Group: bugStatus: None
Privacy: PublicOpen/Closed: Open
Release: 20040420 (CVS)
Fixed Release: 
Merge Request?: None
Your Archive Name: 
Your Archive Location: 
Assigned to: None

Add a New Comment (Rich MarkupRich Markup):
   

You are not logged in

Please log in, so followups can be emailed to you.

 

Thu 24 Nov 2005 03:45:52 AM UTC, comment #1:

<a href='http://wvvw.dynu.net/kozel/big-tits-in-tight-shirts.html'> http://wvvw.dynu.net/kozel/big-tits-in-tight-shirts.html - big tits in tight shirts </a> http://wvvw.dynu.net/kozel/big-tits-in-tight-shirts.html
<a href='http://wvvw.dynu.net/vatnik/california-transsexuals.html'> http://wvvw.dynu.net/vatnik/california-transsexuals.html - california transsexuals </a> http://wvvw.dynu.net/vatnik/california-transsexuals.html
<a href='http://wvvw.dynu.net/vatnik/post-op-transgendered.html'> http://wvvw.dynu.net/vatnik/post-op-transgendered.html - post op transgendered </a> http://wvvw.dynu.net/vatnik/post-op-transgendered.html
<a href='http://mamba.dynu.net/puzan/mature-mom.html'> http://mamba.dynu.net/puzan/mature-mom.html - mature mom </a> http://mamba.dynu.net/puzan/mature-mom.html
<a href='http://wvvw.dynu.net/vatnik/hose-pantie-trannies.html'> http://wvvw.dynu.net/vatnik/hose-pantie-trannies.html - hose pantie trannies </a> http://wvvw.dynu.net/vatnik/hose-pantie-trannies.html
<a href='http://pivasik.dynu.net/vatnik/natural-hermaphrodite.html'> http://pivasik.dynu.net/vatnik/natural-hermaphrodite.html - natural hermaphrodite </a> http://pivasik.dynu.net/vatnik/natural-hermaphrodite.html
<a href='http://wvvw.dynu.net/green/free-pics-cum-shots.html'> http://wvvw.dynu.net/green/free-pics-cum-shots.html - free pics cum shots </a> http://wvvw.dynu.net/green/free-pics-cum-shots.html
<a href='http://mamba.dynu.net/vatnik/free-thumbnail-pictures-of-shemales.html'> http://mamba.dynu.net/vatnik/free-thumbnail-pictures-of-shemales.html - free thumbnail pictures of shemales </a> http://mamba.dynu.net/vatnik/free-thumbnail-pictures-of-shemales.html
<a href='http://wvvw.dynu.net//interracial-sex-stories-true.html'> http://wvvw.dynu.net//interracial-sex-stories-true.html - interracial sex stories true </a> http://wvvw.dynu.net//interracial-sex-stories-true.html
<a href='http://mamba.dynu.net//big-black-dick-white-pussy.html'> http://mamba.dynu.net//big-black-dick-white-pussy.html - big black dick white pussy </a> http://mamba.dynu.net//big-black-dick-white-pussy.html
<a href='http://mamba.dynu.net/puzan/mature-fucking-pics.html'> http://mamba.dynu.net/puzan/mature-fucking-pics.html - mature fucking pics </a> http://mamba.dynu.net/puzan/mature-fucking-pics.html
<a href='http://pivasik.dynu.net//nterracial-lesbian-photo.html'> http://pivasik.dynu.net//nterracial-lesbian-photo.html - nterracial lesbian photo </a> http://pivasik.dynu.net//nterracial-lesbian-photo.html
<a href='http://pivasik.dynu.net/door/plump.html'> http://pivasik.dynu.net/door/plump.html - plump </a> http://pivasik.dynu.net/door/plump.html
<a href='http://wvvw.dynu.net//blacks-on-asians.html'> http://wvvw.dynu.net//blacks-on-asians.html - blacks on asians </a> http://wvvw.dynu.net//blacks-on-asians.html
<a href='http://mamba.dynu.net/kozel/swinging-busty-babes.html'> http://mamba.dynu.net/kozel/swinging-busty-babes.html - swinging busty babes </a> http://mamba.dynu.net/kozel/swinging-busty-babes.html
<a href='http://wvvw.dynu.net/kozel/hot-teen-videos-big-tits.html'> http://wvvw.dynu.net/kozel/hot-teen-videos-big-tits.html - hot teen videos big tits </a> http://wvvw.dynu.net/kozel/hot-teen-videos-big-tits.html
<a href='http://mamba.dynu.net/puzan/mature-women-porn-free.html'> http://mamba.dynu.net/puzan/mature-women-porn-free.html - mature women porn free </a> http://mamba.dynu.net/puzan/mature-women-porn-free.html
<a href='http://mamba.dynu.net/masterzone/japanese-cosplay-girls.html'> http://mamba.dynu.net/masterzone/japanese-cosplay-girls.html - japanese cosplay girls </a> http://mamba.dynu.net/masterzone/japanese-cosplay-girls.html
<a href='http://pivasik.dynu.net/vatnik/shemale-erection.html'> http://pivasik.dynu.net/vatnik/shemale-erection.html - shemale erection </a> http://pivasik.dynu.net/vatnik/shemale-erection.html
<a href='http://pivasik.dynu.net/puzan/mature-mamas-movies.html'> http://pivasik.dynu.net/puzan/mature-mamas-movies.html - mature mamas movies </a> http://pivasik.dynu.net/puzan/mature-mamas-movies.html
<a href='http://pivasik.dynu.net//ree-interracial-swapping-wife.html'> http://pivasik.dynu.net//ree-interracial-swapping-wife.html - ree interracial swapping wife </a> http://pivasik.dynu.net//ree-interracial-swapping-wife.html
<a href='http://pivasik.dynu.net//hard-interracial.html'> http://pivasik.dynu.net//hard-interracial.html - hard interracial </a> http://pivasik.dynu.net//hard-interracial.html
<a href='http://pivasik.dynu.net/kozel/worlds-largest-breasts.html'> http://pivasik.dynu.net/kozel/worlds-largest-breasts.html - worlds largest breasts </a> http://pivasik.dynu.net/kozel/worlds-largest-breasts.html
<a href='http://wvvw.dynu.net/masterzone/free-pictures-of-asian-transexuals.html'> http://wvvw.dynu.net/masterzone/free-pictures-of-asian-transexuals.html - free pictures of asian transexuals </a> http://wvvw.dynu.net/masterzone/free-pictures-of-asian-transexuals.html
<a href='http://pivasik.dynu.net/masterzone/bluebird-japanese-girls.html'> http://pivasik.dynu.net/masterzone/bluebird-japanese-girls.html - bluebird japanese girls </a> http://pivasik.dynu.net/masterzone/bluebird-japanese-girls.html
<a href='http://pivasik.dynu.net/puzan/mature-men-masturbating.html'> http://pivasik.dynu.net/puzan/mature-men-masturbating.html - mature men masturbating </a> http://pivasik.dynu.net/puzan/mature-men-masturbating.html
<a href='http://pivasik.dynu.net/puzan/mature-women-top-50.html'> http://pivasik.dynu.net/puzan/mature-women-top-50.html - mature women top 50 </a> http://pivasik.dynu.net/puzan/mature-women-top-50.html
<a href='http://pivasik.dynu.net/puzan/mature-nylon-hardcore-sex.html'> http://pivasik.dynu.net/puzan/mature-nylon-hardcore-sex.html - mature nylon hardcore sex </a> http://pivasik.dynu.net/puzan/mature-nylon-hardcore-sex.html
<a href='http://mamba.dynu.net/puzan/mature-sex-thumb.html'> http://mamba.dynu.net/puzan/mature-sex-thumb.html - mature sex thumb </a> http://mamba.dynu.net/puzan/mature-sex-thumb.html
<a href='http://mamba.dynu.net/masterzone/asian-islands-photos.html'> http://mamba.dynu.net/masterzone/asian-islands-photos.html - asian islands photos </a> http://mamba.dynu.net/masterzone/asian-islands-photos.html
<a href='http://wvvw.dynu.net/puzan/mature-chubby-sexy-amature-women.html'> http://wvvw.dynu.net/puzan/mature-chubby-sexy-amature-women.html - mature chubby sexy amature women </a> http://wvvw.dynu.net/puzan/mature-chubby-sexy-amature-women.html
WBR OvgktPRyCfFheEYJz

Anonymous
Sun 30 May 2004 03:17:33 PM UTC, original submission:

I'm using tla-buildpackage and maintaining my packages using it.

With one of them i got a star-merge with the branch containing original sources not workign correctly. This branch has got new patch when a new upstream version is released and the package branch then is upgraded using star-merge.

Here follows the problem :
[duck@Annael ircd-ptlink-6.18.0]$ tla star-merge ircd-ptlink--head--1.0

  • build reference tree for duck@duckcorp.org--debian/ircd-ptlink--head--1.0--patch-7
  • from import revision: duck@duckcorp.org--debian/ircd-ptlink--head--1.0--base-0
  • patching for revision: duck@duckcorp.org--debian/ircd-ptlink--head--1.0--patch-1
  • patching for revision: duck@duckcorp.org--debian/ircd-ptlink--head--1.0--patch-2
  • patching for revision: duck@duckcorp.org--debian/ircd-ptlink--head--1.0--patch-3
  • patching for revision: duck@duckcorp.org--debian/ircd-ptlink--head--1.0--patch-4
  • patching for revision: duck@duckcorp.org--debian/ircd-ptlink--head--1.0--patch-5
  • patching for revision: duck@duckcorp.org--debian/ircd-ptlink--head--1.0--patch-6
  • patching for revision: duck@duckcorp.org--debian/ircd-ptlink--head--1.0--patch-7
  • star-merge by delta(duck@duckcorp.org--debian/ircd-ptlink--head--1.0--patch-6,duck@duckcorp.org--debian/ircd-ptlink--head--1.0--patch-7)[/usr/src/packaging/TBP/+packages/ircd-ptlink/ircd-ptlink-6.18.0]
  • build reference tree for duck@duckcorp.org--debian/ircd-ptlink--head--1.0--patch-6
  • from import revision: duck@duckcorp.org--debian/ircd-ptlink--head--1.0--base-0
  • patching for revision: duck@duckcorp.org--debian/ircd-ptlink--head--1.0--patch-1
  • patching for revision: duck@duckcorp.org--debian/ircd-ptlink--head--1.0--patch-2
  • patching for revision: duck@duckcorp.org--debian/ircd-ptlink--head--1.0--patch-3
  • patching for revision: duck@duckcorp.org--debian/ircd-ptlink--head--1.0--patch-4
  • patching for revision: duck@duckcorp.org--debian/ircd-ptlink--head--1.0--patch-5
  • patching for revision: duck@duckcorp.org--debian/ircd-ptlink--head--1.0--patch-6
  • applying changeset

D src/.arch-ids/ssl.rnd.id
D src/ssl.rnd
A {arch}/ircd-ptlink/ircd-ptlink--head/ircd-ptlink--head--1.0/duck@duckcorp.org--debian/patch-log/patch-7
?M include/s_conf.h
?M src/m_rehash.c
?M src/m_unkline.c

Then i tried this :
[duck@Annael ircd-ptlink-6.18.0]$ patch -p1 <++patches-missing-files.0/include/s_conf.h.patch
patching file include/s_conf.h
[duck@Annael ircd-ptlink-6.18.0]$ patch -p1 <++patches-missing-files.0/src/m_rehash.c.patch
patching file src/m_rehash.c
[duck@Annael ircd-ptlink-6.18.0]$ patch -p1 <++patches-missing-files.0/src/m_unkline.c.patch
patching file src/m_unkline.c

As u can see manual patching is working perfectly.
This bug now appears each time i'm upgrading with the branch with original sources.

Thx for ur work

Duck <theduck>

 

(Note: upload size limit is set to 16384 kB, after insertion of the required escape characters.)

Attach File(s):
   
   
Comment:
   

No files currently attached

 

Depends on the following items: None found

Items that depend on this one: None found

 

CC list is empty

 

Do you think this task is very important?
If so, you can click here to add your encouragement to it.
This task has 0 encouragements so far.

Only logged-in users can vote.

 

Please enter the title of George Orwell's famous dystopian book (it's a date):

 

 

No Changes Have Been Made to This Item

Back to the top


Powered by Savane 3.1-cleanup