Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:I make 'merge --baseline' not introduce a new parent in the merge checkin. I think it should behave like --cherrypick.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | annotate_links
Files: files | file ages | folders
SHA1:ba402f33b2478cfb1618effecdb1f6b1e8365ac2
User & Date: viriketo 2012-04-05 14:05:11
Context
2012-04-05
14:19
Allowing partial commit for merges not adding a parent to the checkin. check-in: a610b256 user: viriketo tags: annotate_links
14:05
I make 'merge --baseline' not introduce a new parent in the merge checkin. I think it should behave like --cherrypick. check-in: ba402f33 user: viriketo tags: annotate_links
2012-04-04
16:20
Updating from trunk to get the latest trunk fixes. check-in: b7f3a32d user: viriketo tags: annotate_links
Changes

Changes to src/merge.c.

553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
  }

  /*
  ** Clean up the mid and pid VFILE entries.  Then commit the changes.
  */
  db_multi_exec("DELETE FROM vfile WHERE vid!=%d", vid);
  db_multi_exec("INSERT OR IGNORE INTO vmerge(id,merge) VALUES(%d,%d)",
                pickFlag ? -1 : (backoutFlag ? -2 : 0), mid);
  if( pickFlag ){
    /* For a cherry-pick merge, make the default check-in comment the same
    ** as the check-in comment on the check-in that is being merged in. */
    db_multi_exec(
       "REPLACE INTO vvar(name,value)"
       " SELECT 'ci-comment', coalesce(ecomment,comment) FROM event"
       "  WHERE type='ci' AND objid=%d",
       mid
    );
  }
  undo_finish();
  db_end_transaction(nochangeFlag);
}







|













553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
  }

  /*
  ** Clean up the mid and pid VFILE entries.  Then commit the changes.
  */
  db_multi_exec("DELETE FROM vfile WHERE vid!=%d", vid);
  db_multi_exec("INSERT OR IGNORE INTO vmerge(id,merge) VALUES(%d,%d)",
                pickFlag ? -1 : (backoutFlag ? -2 : (zPivot ? -3 : 0)), mid);
  if( pickFlag ){
    /* For a cherry-pick merge, make the default check-in comment the same
    ** as the check-in comment on the check-in that is being merged in. */
    db_multi_exec(
       "REPLACE INTO vvar(name,value)"
       " SELECT 'ci-comment', coalesce(ecomment,comment) FROM event"
       "  WHERE type='ci' AND objid=%d",
       mid
    );
  }
  undo_finish();
  db_end_transaction(nochangeFlag);
}