How can I sync files in two different git repositories (not clones) and maintain history? -

-

I keep two separate git repos that need to share some files, and I want to To be shown in a repo in another. What is a good way to do this for ongoing maintenance in each repo?

I'm one of its controllers, and recently I fell in the role of maintaining Pearl's core documentation, whatever Git.

Before I maintain perlfaq, it used to remain in a separate source control repository. I recently changed the GIT. From time to time, one of the perl5-porters will sync shared files in perlfaq repo and Pearl repo. Since we have switched to git, we are a bit lazy to change tools, and now I am what it does. For the time being, two repos are going to be different.

Currently, to sync a frequently asked question for a new (monthly) release of Pearl, I'm ashamed to say that I only perlfaq * .pod Files perlfaq repo and overlay them in Pearl repo loses this history, etc. In addition, sometimes someone changes the Perl repo in those files and I overwrite it (yes, check git diff stupid!). The repository does not have the same path in the files, but there is something I can change, I think.

What do I want to do, in the magical universe of the rainbow and pony, pull objects from Perlfaq repo and apply them in perl repo, and vice versa, hence the history and committed are related in each ID.

  • The construction of the patch works, but it is a lot of work to manage.
  • The GET subdomain works only to pull in the entire external repo
  • I have not found anything like SVN file extant, but it will work in both directions anyway
  • I just want to bring things from one and take the cherries in the other.

What is a good way to manage it?

Subdivision merge strategy combined with the script, can help here.
It will work to push and pull.
This is still something, though Git1.7.0 will be fixed with the ' -Xsubtree option, but it's still worth looking into it.


Comments

Post a Comment

Popular posts from this blog

c# - How to capture HTTP packet with SharpPcap -

-
I would like to capture all incoming HTTP packets on my machine. To do this, I am using SharpPcap which is a WinPcap The cover is. SharpPcap works very well, but it captures TCP packets and what it wants to do for me is a very low level. Does anyone know how can I easily get full HTTP requests / reactions from all these TCP packets? Thanks SharpPcap is already able to capture the packet in the same way That's what the virus does (just in the code instead of the GUI). And you can either either parse them directly or you can put them in the drive in the common .pcap file format. The steps to parse the capture are: Open a connection at any time Loop a while Or start capturing using an event callback Parsing the raw packet for the type you want If you are reading .PPP dump files In addition to calling you an offline capture reader is almost the same, there is no need to select an interface, and you can set the majority There is no need to do the modes. All st...
Read more

php - Multiple Select with Explode: only returns the word "Array" -

-
By using Wordpress I have created a multiple selection box so that users can select categories to exclude. When the page is initially loaded, I see my predefined default option. However, when I select a new value and I save ... I only see the word "Array" and have not chosen anything else? & lt; Class = "amultiple" id = "& lt; php echo $ value ['id'] ;? gt;" name = "& gt; php echo $ value ['id'] ;; gt; []" Multiple = "multiple" size = "8" & gt; & Lt ;? Php global option; Foreign currency ($ value as value $) {if (get_settings ($ value ['id']) === FALSE {$$ value ['id'] = $ value ['std']; } And {$$ value ['id'] = get_settings ($ value ['id']); }} $ Ranges = & amp; Amp; Categories ('type = post & orderbiz = name & amp; hide_empty = 1'); If ($ ranges) {$ ex_cat = implode (',', $ tt_cat_exclude); Forex Currency ($ range a...
Read more

php - jQuery AJAX Post not working -

-
I do not understand why this script does not work. It has something to do within AJAX PostScript / Function. Right now, when I submit my form, it runs php code on the same page. What it should do, send the values ​​of the form for Project_Azax.fp, then there will be a refund of success on the page which is correct or false. $ (document) .ready (function () {$ ('div # didIt'). Hide (); $ ('form [name = adminForm]'). Submit (function () ($ {'.post' ('/ project_ajax.php', {action: $ ('[name = action]') Val (), pId: $ ('[name = pId]'). Val (), name ('[Name = name]'. Val (), url: $ ('[url = url]'). Val (), summary: ('[summary = summary]'). Val ()}, Function (data) {if (data.success) {$ ('div # didIt') .Sliddown ('slow');} and {warning ('unsuccessful SA!');}}, 'Jason'); return false ;});}); What is the code for project_ajax.php below ... if ($ _ POST ['action'] == ...
Read more