merge - If a branch in SVN was created against the wrong revision in trunk should I just created the branch? -

-

If I create a branch in SVN off trunk rev 10, then I realized what I want 9 9 I just do this branch Can create a new review from the ditch and 9 or, what is the way to "rebase" the Riv 9?

The problem is that what I know now is a long / big change to return some changes to my code and then to make a branch since the trunk is already using the old code code I had to upgrade, even though at the beginning, my incomplete new feature my branch needs to close RX X-1 as my branch was on X + 1 so the easiest way to get it in X-1 Or is it?

Just remove the branch and recreate it ... This is the least expensive in the repository.


Comments

Post a Comment

Popular posts from this blog

Is there an open source WebSockets (JavaScript) XMPP library? -

-
Has anyone written the open source XMPP library that uses the websacet and is being run by a browser? We do not yet have a standard XMPP that can enforce the server, Must be adequately faced before it may be necessary The first step is to eliminate WebSAT standardization. It seems that it can be in an IETF Haib working group, which has not been approved by the IESG so far in the writing time (see) a few weeks ago (Hiroshima), a hybrid bird-of-a-feather in IETF ( BOF), which went very well. WebSketches have a constant reference, and it seems to be systematically organized, one will make XMPP binding for webmasters, possibly with a bar for every webset frame. Edit: Jack Moffitt has written an IETF can be used with the first pass on a protocol. Warning . It is still likely to change fast enough, only apply it if you are ready to wrap it completely later. Warning
Read more

java - Is there an object like a "Set" that can contain only unique string values, but also contain a count on the number of occurrences of the string value? -

-
There is an object like "set" in Java that can contain only unique string values, but it also includes a count Is the number of string value in number? This idea is simple. A data set, ALA ... ABBCCC I will set the text of each line set- I want to add to the object every time a non-unique text is added to the set, I also want to show a numeric value associated with the set to show how often it was added. So if I run it on the above data then set output will be something like this: A: 1B: 2C: 3 Any ideas? Maps & lt; String, integer & gt; add public null (strings) {if (map.containsKey (s)) {map.put (s, map.get (s) + 1); } And {map.put (S, 1); }}
Read more

mysql - Can mysql_pconnect be called multiple times in one php page? -

-
I was wondering if it is valid for calling mysql_pconnect several times in a php page? Also, if possible, should I either close my last ISSL handle or something? Actually the following code is okay? Or is there a lack of some other steps? mysql_pconnect ("ip: 3306", "user", "pass") or die (mysql_error ()); Mysql_select_db ("test") or die (mysql_error ()); // Some SQL queries mysql_pconnect ("ip2: 3306", "user", "pass") or die (mysql_error ()); Mysql_select_db ("test") or die (mysql_error ()); // Another SQL query Yes but this is probably a better practice, both the headset To store both in the database and make the correct DB explicit use. dbServer1 = mysql_pconnect ("ip: 3306", "user", "pass") or die (mysql_error ()); Mysql_select_db ("test", dbServer1) or die (mysql_error ()); DbServer2 = mysql_pconnect ("ip: 3306", "user", "...
Read more