Fossil SCM

Process xfer-ticket-script for each round-trip to avoid lost hook invocations (thanks to Jan Nijtmans for catching this).

andybradford 2014-05-20 05:23 UTC per-round-trip-commit
Commit 28a24c4ba6bdbec40dd47bd864beba25389aba39
1 file changed +1 -1
+1 -1
--- src/xfer.c
+++ src/xfer.c
@@ -1913,11 +1913,11 @@
19131913
** information which is only sent on the second round.
19141914
*/
19151915
if( cloneSeqno<=0 && nCycle>1 ) go = 0;
19161916
db_multi_exec("DROP TABLE onremote");
19171917
if( go ){
1918
- manifest_crosslink_end(MC_NONE);
1918
+ manifest_crosslink_end(MC_PERMIT_HOOKS);
19191919
}else{
19201920
manifest_crosslink_end(MC_PERMIT_HOOKS);
19211921
content_enable_dephantomize(1);
19221922
}
19231923
db_end_transaction(0);
19241924
--- src/xfer.c
+++ src/xfer.c
@@ -1913,11 +1913,11 @@
1913 ** information which is only sent on the second round.
1914 */
1915 if( cloneSeqno<=0 && nCycle>1 ) go = 0;
1916 db_multi_exec("DROP TABLE onremote");
1917 if( go ){
1918 manifest_crosslink_end(MC_NONE);
1919 }else{
1920 manifest_crosslink_end(MC_PERMIT_HOOKS);
1921 content_enable_dephantomize(1);
1922 }
1923 db_end_transaction(0);
1924
--- src/xfer.c
+++ src/xfer.c
@@ -1913,11 +1913,11 @@
1913 ** information which is only sent on the second round.
1914 */
1915 if( cloneSeqno<=0 && nCycle>1 ) go = 0;
1916 db_multi_exec("DROP TABLE onremote");
1917 if( go ){
1918 manifest_crosslink_end(MC_PERMIT_HOOKS);
1919 }else{
1920 manifest_crosslink_end(MC_PERMIT_HOOKS);
1921 content_enable_dephantomize(1);
1922 }
1923 db_end_transaction(0);
1924

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button