Changes between Initial Version and Version 4 of Ticket #3886


Ignore:
Timestamp:
04/21/2016 10:54:06 AM (4 years ago)
Author:
sergz
Comment:

I have updated the issue, there is yet one trouble, the branch on github is not removed after removing of bookmark in mercurial. JIC, please find the log of pushing commands

e:\projects\eyeo\hg\libadblockplus.push>hg push -B master
pushing to ssh://hg@hg.adblockplus.org/libadblockplus
searching for changes
remote: adding changesets
remote: adding manifests
remote: adding file changes
remote: added 1 changesets with 0 changes to 0 files
remote: updating https://issues.adblockplus.org/ticket/3337
remote: abort: push creates new remote head 597c6056d85f with bookmark 'issue-3337-update-adblockplus'!
remote: (merge or see "hg help push" for details about pushing new heads)
updating bookmark master

e:\projects\eyeo\hg\libadblockplus.push>hg push -B issue-3337-update-adblockplus
pushing to ssh://hg@hg.adblockplus.org/libadblockplus
searching for changes
no changes found
deleting remote bookmark issue-3337-update-adblockplus

Legend:

Unmodified
Added
Removed
Modified
  • Ticket #3886

    • Property Owner set to matze
  • Ticket #3886 – Description

    initial v4  
    22Please compare commits https://hg.adblockplus.org/libadblockplus/rev/master and https://github.com/adblockplus/libadblockplus/commits/master. 
    33 
    4 In addition branch ''issue-3337-update-adblockplus'' is also not updated. I've rebased ''issue-3337-update-adblockplus'' in mercurial and used a forced push, but the branch in github has not been update to the right commit. 
     4In addition 
     51. branch ''issue-3337-update-adblockplus'' is also not updated. I've rebased ''issue-3337-update-adblockplus'' in mercurial and used a forced push, but the branch in github has not been update to the right commit. 
     6 
     72. after removing of bookmark ''issue-3337-update-adblockplus'' the corresponding branch in git is not removed. 
    58 
    69=== Expected behaviour ===