bugGnash - The GNU Flash player - Bugs: bug #34697, data loss, commits vanish

 
 

bug #34697: data loss, commits vanish

Submitted by:  Gabriele Giacone <gg0>
Submitted on:  Sun 30 Oct 2011 11:30:57 AM UTC  
 
Category: NoneSeverity: 4 - Important
Release: masterStatus: Fixed
Privacy: PublicAssigned to: Bastiaan Jacques <bjacques>
Open/Closed: Closed

Add a New Comment (Rich MarkupRich Markup):
   

You are not logged in

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

 

(Jump to the original submission Jump to the original submission)

Fri 05 Jul 2013 08:50:33 AM UTC, comment #6:

I suspect the cause of this issue is rather simpler: most of the changes of 6e229c0e were correctly retained in the merge. But the other parent of the merge introduced a new line immediately preceeding the two lines removed in 6e229c0e (though the new line has since been commented out). Automatic conflict resolution would have failed, and in the manual conflict resolution presumably the lines were retained by accident.

I've re-removed the two lines in f8ca64a.

Bastiaan Jacques <bjacques>
Project MemberIn charge of this item.
Fri 31 May 2013 05:37:54 AM UTC, comment #5:

I may have found a sequence of git commands that might bring to this situation:

http://marc.info/?l=git&m=136993172804666&w=2

possible ?

Sandro Santilli <strk>
Project Member
Fri 20 Jan 2012 05:09:50 PM UTC, comment #4:

As AC_CHECK_LIB(Xi, XInput_find_display) exists in master, this should be closed.

Rob Savoye <rsavoye>
Project Administrator
Tue 01 Nov 2011 04:48:25 PM UTC, comment #3:

The line was preserved in merge commit 6e229c0e.

Parent commit 476deea83 has the line but the other parent commit d90badbc does not.

Markus Rinne <maramon>
Sun 30 Oct 2011 12:49:14 PM UTC, comment #2:

Yep, commit exists but its changes don't. For instance "AC_CHECK_LIB(Xi, XInput_find_display)" line removal.
What reintroduced such line which is on master now?

Gabriele Giacone <gg0>
Project Member
Sun 30 Oct 2011 12:03:18 PM UTC, comment #1:

I do find commit f8c0f877 in my copy of the repo.
What do you mean by "vanished" ?

Sandro Santilli <strk>
Project Member
Sun 30 Oct 2011 11:30:57 AM UTC, original submission:

bjacques pointed a vanished commit out: f8c0f877

It seems it disappeared with cb661363 "huge merge to catch up with master..." by rsavoye.

We had already noticed another data loss, see bug #34313.

Gabriele Giacone <gg0>
Project Member

 

(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

 

Carbon-Copy List
  • -unavailable- added by bjacques (Posted a comment)
  • -unavailable- added by rsavoye (Updated the item)
  • -unavailable- added by maramon (Posted a comment)
  • -unavailable- added by strk (Posted a comment)
  • -unavailable- added by gg0 (Submitted the item)
  •  

    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):

     

     

    Follow 3 latest changes.

    Date Changed By Updated Field Previous Value => Replaced By
    Fri 05 Jul 2013 08:50:33 AM UTCbjacquesAssigned toNone=>bjacques
      Open/ClosedOpen=>Closed
    Fri 20 Jan 2012 05:09:50 PM UTCrsavoyeStatusNone=>Fixed

    Back to the top


    Powered by Savane 3.1-cleanup