Mercurial: Did not pull before committing local changes and push. Created 8+ heads -

-

i read questions suggested while posing, ended getting confused :s made few changes , committed , pushed them. later came know repository pushed to, before pushed it. questions are:

q1. did pushing overwrite repository, i.e repository no longer have changes pushed before me?

q2. should in such cases? need have changes made, , other changes too, w/o having make other guy pull code, re-commit, re-push, , pulling again, same working copy.

q3. there anyway code can updated/pulled implicitly before commit/push?

q4. rebase option? read on documentation, changes perform on code not private.

assumptions:

  1. there aren't branches created. (well, created, different modules, , not concerned them).
  2. i use eclipse , mercurialeclipse.

edit: sorry if question (possible) duplicate of existing question.

when manage create medusa-repo in hg, determine branch going "mainline". go each sub-branch , perform process:

hg -r subbranch hg merge -r mainline-branch hg commit -m "merged main" hg -r mainline-branch hg merge -r subranch hg commit -m "brought in subchanges subbranch"

by merging subbranch first, make sure mainline doesn't damaged, can trivially merge mainline.

this not major crisis; requires working other developers start hitting same branch again in next day or so.


Comments

Post a Comment

Popular posts from this blog

android - Spacing between the stars of a rating bar? -

-
ho can set spacing beween stars? thats ratingbar: ratingbar = (ratingbar) inflater.inflate(r.layout.ratingbar, null); ratingbar.setlayoutparams(new layoutparams(layoutparams.wrap_content, layoutparams.wrap_content)); the layout: <?xml version="1.0" encoding="utf-8"?> <ratingbar xmlns:android="http://schemas.android.com/apk/res/android" style="@style/mystyle" android:layout_alignparentright="true" android:layout_height="19dp" android:layout_width="wrap_content" android:numstars="5"> </ratingbar> the style: <style name="mystyle" parent="@android:style/widget.ratingbar"> <item name="android:progressdrawable">@drawable/android_r2_ratingstar_yellow</item> <item name="android:indeterminatedrawable">@drawable/android_r2_ratingstar_grey</item> </style> thanks, cheers you have ...
Read more

html - Instapaper-like algorithm -

-
does of algorithm extracts contents webpage? instapaper ? there 2 steps instapaper does: find main content block on page (excluding headers, footers, menus etc) from content block extract , format text to find content block (typically html block element, div containing key page text content) instapaper uses algorithm 1 used readability . can @ source of readability.js see what's going on, @ core tries find area on page highest text/link ratio, although has other simple scoring metrics (e.g. off top of head, things ratio of text commas, para elements etc) go heuristics. once have identified root node element, relevant content, you'll need format it, if want can pull node element containing text out of source document , insert yours, in reality you'll want remove existing styles , apply own, standard , feel. if want output nice text-only can use jericho's renderer . update1 : should mention else instapaper - follow 'pagination' links (...
Read more

c# - How to execute a particular part of code asynchronously in a class -

-
i creating speech recognition engine that's going respond user commands.i have created button enable , disable speech recognition per user convenience.i have used dispose() of speech engine disable speech recoginition.here code private void button1_click(object sender, routedeventargs e) { engineon = !engineon; if (engineon) { speechengine = speech.createspeechengine(); //speech class creates , returns new speech engine. speechengine.audiolevelupdated += new eventhandler<audiolevelupdatedeventargs>(speechengine_audiolevelupdated); // use system's default microphone speechengine.setinputtodefaultaudiodevice(); speechengine.loadgrammar(new dictationgrammar()); // start listening speechengine.recognizeasync(recognizemode.multiple); } else { speechclass.myengine.dispose(); } } but disposal of speech obj...
Read more