perforce - git p4 submit from a bare repository? -


we have devs pushing remote bare repo on server, , automate push perforce nightly using git p4 central bare repo. running snag because seems can't run git p4 submit outside of working tree.

what's recommended way deal this?

i similar script runs every few minutes , 2-way sync between git , p4. git-p4 can't work without both checked-out git tree , p4 repo. in end 3 versions of source:

  1. the bare git repo
  2. checked-out git repo 'git p4' work in
  3. p4 checkout submit p4 from.

developers push bare git repo (held on gitolite), using branch called 'dev'. every few minutes, there's script does:

  1. update checked-out git tree (git pull --rebase)
  2. pull down latest upstream p4 changes p4/master (git p4 sync)
  3. rebase git world against p4 world (git rebase p4/master)
  4. send git changes p4 (git p4 submit)
  5. rewrite 'dev' branch (git push origin +head:dev)

gotchas

  1. merge conflicts. these occur infrequently can cause few problems.

  2. i had add locking around whole thing developers don't lose changes if push change between (1) , (5). locking creates lock directory gets used in 1 of hook scripts delay pushes.

  3. rcs keywords. newer versions of 'git p4' copes rcs keywords didn't, whole thing stuck cause merge conflicts.

it took while setup it's been going 18 months 100+ developers few incidents.


Comments

Post a Comment

Popular posts from this blog

javascript - backbone.js Collection.add() doesn't `construct` (`initialize`) an object -

<!doctype html public "-//w3c//dtd xhtml 1.0 strict//en" "http://www.w3.org/tr/xhtml1/dtd/xhtml1-strict.dtd"> <html> <head> <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script> <script src="http://documentcloud.github.com/underscore/underscore-min.js"></script> <script src="http://documentcloud.github.com/backbone/backbone-min.js"></script> </head> <body> <button id="cmd_create_event" name="cmd_create_event" type="button">create new `event`</button> <script type="text/javascript"> var eventmodel = backbone.model.extend({ initialize : function() { console.log("`event` initialized. id: " + this.cid); this.bind("change:status", function() { console.log(this.get("status") + " value `status`"); }); this.bind("error", function(model, e...
Read more

php - Get uncommon values from two or more arrays -

is there function in php give array of uncommon values 2 or more arrays? for example: $array1 = array( "green", "red", "blue"); $array2 = array( "green", "yellow", "red"); .... $result = function_needed($array1, $array2,...); print_r($result); should give output: array("blue", "yellow", ...); use array_diff , array_merge : $result = array_merge(array_diff($array1, $array2), array_diff($array2, $array1)); here's demo. for multiple arrays, combine callback , array_reduce : function unique(&$a, $b) { return $a ? array_merge(array_diff($a, $b), array_diff($b, $a)) : $b; } $arrays = array( array('green', 'red', 'blue'), array('green', 'yellow', 'red') ); $result = array_reduce($arrays, 'unique'); and here's demo of that.
Read more

Adding duplicate array rows in Php -

i create function in php adds rows of array shared column value. so input. $test = array( array("c", 5, 6), array("c", 2, 3), array("test", 5, 6) ); and output. $testduplicatefree = array( array("c", 7, 9), array("test", 5, 6) ) ); i'm thinking function combine_duplicates($array,$col){ ... ... return $duplicatefreearray; } where $col duplicate free array. so, in case, combine_duplicates($test,0); would me desired output. this. <?php function combine_duplicates($array,$col) { $index = array(); foreach ($array $row) { $key = $row[$col]; if (!isset($index[$key])) { $index[$key] = $row; } else { ($i = 0; $i < count($row); ++$i) { if ($i != $col) { $index[$key][$i] += $row[$i]; } } } } return array_values($index); } $array = array( array("c", 5, 6), array("c", 2, 3), array("test", 5, 6) ); print_r(combine_duplicates($array, 0)); try here: http://codepad.org/mdhesqhi
Read more